root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
105,907 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

48 Commits

Author SHA1 Message Date
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18:08:32 +00:00
GitLab Bot 2f147005c5 Add latest changes from gitlab-org/gitlab@master 2020-07-11 00:09:17 +00:00
GitLab Bot 0a319374e7 Add latest changes from gitlab-org/gitlab@master 2020-07-08 06:09:13 +00:00
GitLab Bot ebe92e84a9 Add latest changes from gitlab-org/gitlab@master 2020-06-26 18:09:03 +00:00
GitLab Bot 1127990db8 Add latest changes from gitlab-org/gitlab@master 2020-06-22 03:08:17 +00:00
GitLab Bot c2908ec6a0 Add latest changes from gitlab-org/gitlab@master 2020-04-27 15:10:16 +00:00
GitLab Bot 0eb3d2f799 Add latest changes from gitlab-org/gitlab@master 2020-02-06 15:09:11 +00:00
GitLab Bot 9044365a91 Add latest changes from gitlab-org/gitlab@master 2020-01-15 15:08:32 +00:00
GitLab Bot b4028d4500 Add latest changes from gitlab-org/gitlab@master 2020-01-07 15:07:34 +00:00
GitLab Bot f1bb2a307e Add latest changes from gitlab-org/gitlab@master 2019-10-21 18:06:29 +00:00
Stan Hu 021e8790c6 Enable Gitaly FindCommit caching for TreeController 
Accessing /namespace/project/tree/master appears to query
FindCommit 5 times with identical parameters. This reduces
the number of FindCommit queries to 1.
 2019-04-07 20:59:40 -07:00
Martin Wortschack 5660690787 Externalize strings in projects controllers 
- concerns
- dashboard
- groups
- import
 2019-03-27 16:52:52 +00:00
Nick Thomas 178daffe70
Remove two unused formats from Projects::TreeController#show 
I think these two have been have been replaced with the `logs_tree`
endpoint
 2019-02-14 14:19:26 +00:00
gfyoung 12ee2753c1 Enable even more frozen string in app/controllers 
Enables frozen string for some vestigial files as
well as the following:

* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb

Partially addresses #47424.
 2018-09-25 22:43:49 -07:00
Dmitriy Zaporozhets 8fe9995f11
Replace deprecated name_with_namespace with full_name in app and spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-03-05 16:15:26 +02:00
Phil Hughes cbd3ce8f41
moved lfs_blob_ids method into ExtractsPath module 2017-12-14 11:59:01 +00:00
Phil Hughes 7d2affeff1
moved lfs blob fetch from extractspath file 2017-12-14 10:10:20 +00:00
Phil Hughes dec420feb3
fixed project homepage not having correct variable 2017-12-11 16:22:22 +00:00
Phil Hughes f38a6d6ee6
Added LFS badge to indicate LFS tracked files 
Closes #15567
 2017-12-11 12:17:11 +00:00
Phil Hughes 4699cf77b6
added feature spec 2017-10-23 10:47:22 +01:00
Phil Hughes c3dec96e83
Fixed bug when clicking file link causing user to navigate away 
Adds a test for flattenedFiles
Changes the data method to not be an arrow method
Various other review fixes
 2017-10-17 11:03:12 +01:00
Phil Hughes b1b91aa065
Refactored multi-file data structure 
This moves away from storing in a single array just to render the table.
It now stores in a multi-dimensional array/object type where each entry
in the array can have its own tree. This makes storing the data for
future feature a little easier as there is only one way to store the
data.

Previously to insert a directory the code had to insert the directory
& then the file at the right point in the array. Now the directory
can be inserted anywhere & then a file can be quickly added into this
directory.

The rendering is still done with a single array, but this is handled
through underscore. Underscore takes the array & then goes through
each item to flatten it into one. It is done this way to save changing
the markup away from table, keeping it as a table keeps it semantically
correct.
 2017-10-16 11:29:30 +01:00
Douwe Maan 711bb28568 Add Page-Title header to tree and blob JSON endpoints 2017-09-26 17:31:47 +02:00
Andrew Newdigate a1f96aa254 Workaround for n+1 in Projects::TreeController#show 
See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
 2017-09-22 17:53:08 +01:00
Luke "Jared" Bennett 6448368b5b
Merge remote-tracking branch 'origin/master' into ide 2017-07-20 17:51:07 +01:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Douwe Maan d9b15661c9 Add experimental JSON format for tree controller 2017-06-13 21:33:26 -04:00
Douwe Maan b38c74d696 Revert 'New file from interface on existing branch' 2017-06-09 10:10:47 -05:00
Douwe Maan d3b24a7638 Show last commit for current tree on tree page 2017-05-17 20:59:26 +03:00
Rémy Coutable 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
Douwe Maan d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
Jacopo 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
Douwe Maan f40716f48a No more and/or 2017-02-21 16:31:14 -06:00
Douwe Maan f4f4a6b530 Fix specs and behavior for LFS files 2015-12-18 16:14:12 +01:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Douwe Maan e945ec0280 Add "Start a new merge request" option to every commit form 2015-11-17 18:53:56 +01:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Stan Hu 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
Stan Hu 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
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-04-20 15:39:37 +02:00
Vinnie Okada 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
Douwe Maan 00408f37e3 Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
Vinnie Okada 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
Dmitriy Zaporozhets c916124178 Explicitly set before_filter for ref-related controllers 2015-01-26 15:01:51 -08:00
Marin Jankovski 005752e4c6 Check if blob or tree and redirect to the correct one. 2014-07-07 15:46:57 +02:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00