6448368b5b
Merge remote-tracking branch 'origin/master' into ide
2017-07-20 17:51:07 +01:00
fe13f11041
Create and use project path helpers that only need a project, no namespace
2017-07-05 11:11:59 -05:00
d9b15661c9
Add experimental JSON format for tree controller
2017-06-13 21:33:26 -04:00
b38c74d696
Revert 'New file from interface on existing branch'
2017-06-09 10:10:47 -05:00
d3b24a7638
Show last commit for current tree on tree page
2017-05-17 20:59:26 +03:00
d40e1f547e
Enable the Style/TrailingCommaInLiteral cop
...
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
d170133bde
Refactor changing files in web UI
2017-04-20 00:37:44 +00:00
7b04b63eeb
New directory from interface on existing branch
...
The user can create a new directory on a different branch than the
source branch when the branch already exists.
2017-03-21 11:51:53 +01:00
f40716f48a
No more and/or
2017-02-21 16:31:14 -06:00
f4f4a6b530
Fix specs and behavior for LFS files
2015-12-18 16:14:12 +01:00
d9c82d679f
Automatically fork a project when not allowed to edit a file.
2015-12-18 10:03:34 +01:00
e945ec0280
Add "Start a new merge request" option to every commit form
2015-11-17 18:53:56 +01:00
8346dde052
Only render 404 page from /public
2015-10-13 20:12:34 +03:00
0ab6ca93aa
Add directory feature button
...
Change "+" icon under "Files" section to have three options:
* Create file
* Upload file
* New directory
Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.
Closes #2799 : Fixes a bug where file modes were overwritten after a commit
Closes https://github.com/gitlabhq/gitlabhq/issues/8253 : Existing files
can no longer be overwritten in the "Create file" section.
Closes #2557
2015-10-07 04:22:55 -07:00
643557dabc
Fix 404 error in files view after deleting the last file in a repository
...
Closes #1362
2015-07-21 14:12:43 -07:00
5a4ebfb47a
Fixed the Rails/ActionFilter cop
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
2a9eed6620
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/projects/commits/_commit.html.haml
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue_context.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/show/_context.html.haml
2015-02-21 12:55:28 -07:00
00408f37e3
Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.
2015-02-20 17:20:03 +01:00
76aad9b76e
Upgrade to Rails 4.1.9
...
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
c916124178
Explicitly set before_filter for ref-related controllers
2015-01-26 15:01:51 -08:00
005752e4c6
Check if blob or tree and redirect to the correct one.
2014-07-07 15:46:57 +02:00
160bd862be
Refactoring for EditTree and NewTree controllers and contexts
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 12:21:11 +02:00
ae9dd62762
Update code to work with gitlab_git 3
2013-10-01 17:00:28 +03:00
2ed7cbfba4
Move projects controllers/views in Projects module
2013-06-23 19:47:22 +03:00
Luke "Jared" Bennett