delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'improve-archived-projects'	Dmitriy Zaporozhets	2016-03-09	4	-24/+32
\|\
\| *	Add projects list sort dropdown to group page	Dmitriy Zaporozhets	2016-03-04	1	-2/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Add option to show archived projects on dahsboard	Dmitriy Zaporozhets	2016-03-04	3	-22/+28
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Remove instance variable @group multiple assignment	Yatish Mehta	2016-03-08	1	-1/+1
\| \|
* \|	Merge branch 'cache-raw-2' into 'master'	Douwe Maan	2016-03-07	2	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set cache headers for raw blobs This changes allows browsers and (in the case of public projects) proxy caches to cache raw Git blob responses. See merge request !3113
\| * \|	Refactor caching code	Jacob Vosmaer	2016-03-07	2	-4/+5
\| \| \|
\| * \|	Tell clients/proxies to cache raw blob requests	Jacob Vosmaer	2016-03-03	2	-0/+4
\| \| \|
* \| \|	Merge branch 'issue_13621_2' into 'master'	Douwe Maan	2016-03-07	1	-4/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Labels should be visible in dashboard and group milestone views Closes #13621 See merge request !2931
\| * \| \|	Updates from last code review.issue_13621_2	Rubén Dávila	2016-03-06	1	-4/+0
\| \| \| \|
* \| \| \|	Merge branch 'rs-no-default-credentials' into 'master'	Douwe Maan	2016-03-04	2	-0/+26
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow the initial admin to set a password Closes #1980 See merge request !3068
\| * \| \|	Allow the initial admin to set a passwordrs-no-default-credentials	Robert Speicher	2016-03-04	2	-0/+26
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Closes #1980
* \| \|	Merge branch 'fix/sentry-1182' into 'master'	Douwe Maan	2016-03-04	1	-6/+2
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today For some reason, GoogleBot accesses `/u/:username/calendar_activities` without a `:date` param, but then the view was trying to call `#to_s(:short)` which doesn't exist on `nil`, leading to the following Sentry report: https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/ See merge request !3074
\| * \|	In UsersController#calendar_activities, when Date isn't parsable, fallback ↵fix/sentry-1182	Rémy Coutable	2016-03-03	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to Date.today For some reason, GoogleBot accesses /u/:username/calendar_activities without a :date param, but then the view was trying to call #to_s(:short) which doesn't exist on nil, leading to the following Sentry report: https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/
* \| \|	Merge remote-tracking branch 'origin/sort-starred-projects'	Dmitriy Zaporozhets	2016-03-04	1	-1/+1
\|\ \ \
\| * \| \|	Revert "Revert "Sort starred projects on dashboard based on last activity by ↵sort-starred-projects	Dmitriy Zaporozhets	2016-03-03	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	default"" This reverts commit 617bb1096deb1fb5dea66d04b9bbd7da0dfb57ba.
* \| \|	Invalidate cache for builds badge	Grzegorz Bizon	2016-03-04	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #13982
* \| \|	Don't abuse the flash store for displaying SSH Key form errors	Robert Speicher	2016-03-03	1	-2/+3
\| \| \|
* \| \|	Remove `Profile::KeysController#new` action	Robert Speicher	2016-03-03	1	-4/+0
\| \| \|
* \| \|	Fixed failing ssh key tests	Phil Hughes	2016-03-03	1	-1/+1
\| \| \|
* \| \|	SSH keys settings	Phil Hughes	2016-03-03	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #13860
* \| \|	Use Gitlab::Git::DiffCollections	Jacob Vosmaer	2016-03-03	3	-12/+13
\|/ /
* \|	Revert "Sort starred projects on dashboard based on last activity by default"	Dmitriy Zaporozhets	2016-03-03	1	-1/+1
\| \| \| \| \| \| \| \|	This reverts commit 70d6455284717f938016b1e1b569e0d0dadb11fc.
* \|	Sort starred projects on dashboard based on last activity by default	Dmitriy Zaporozhets	2016-03-03	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'refactor-projects-list' into 'master'	Dmitriy Zaporozhets	2016-03-03	1	-0/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor projects list 1. Fix double bottom border if pagination 2. Fix broken search on forks page 4. Remove duplicate js logic 4. Remove unused show all link 5. Remove duplicate “no project” message in different views After this merge request you can easily render shared projects template with all necessary html/js included to make searchable list with pagination. All you need to provide is controller that returns projects list with seach nad pagination and render html form with project-filter-form id and text field with filter_projects name. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @DouweM See merge request !3075
\| * \|	Refactor projects list	Dmitriy Zaporozhets	2016-03-03	1	-0/+11
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Fix double bottom border if pagination 2. Fix broken search on forks page 4. Remove duplicate js logic 4. Remove unused show all link 5. Remove duplicate “no project” message in different views After this merge request you can easily render shared projects template with all necessary html/js included to make searchable list with pagination. All you need to provide is controller that returns projects list with seach nad pagination and render html form with project-filter-form id and text field with filter_projects name. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'issue_13648' into 'master'	Douwe Maan	2016-03-03	1	-8/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Reuse query from ProjectsFinder to get projects accessible to current user. Fixes #13648 This is a refactor to reuse the existing query from our `ProjectsFinder` class See merge request !3049
\| *	Add specs to ForksController#index.issue_13648	Rubén Dávila	2016-03-02	1	-6/+1
\| \| \| \| \| \| \| \| \| \|	* Also refactor query to get projects accessible for current user. ProjectsFinder actually return public projects when no user is passed.
\| *	Reuse query from ProjectsFinder to get projects accessible to current user.	Rubén Dávila	2016-03-01	1	-3/+1
\| \|
* \|	Merge branch 'issue_4095' into 'master'	Dmitriy Zaporozhets	2016-03-03	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show Issues/MRs from archived projects in Groups view Fixes #4095 See merge request !2980
\| * \|	Don't list merge requests from archived projects in Group view.	Rubén Dávila	2016-03-02	1	-1/+1
\| \| \|
\| * \|	Don't list issues from archived projects in Group view.	Rubén Dávila	2016-03-02	1	-1/+1
\| \| \|
* \| \|	Merge branch 'improve-user-tabs' into 'master'	Jacob Schatz	2016-03-03	1	-7/+53
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961
\| * \ \	Merge branch 'master' into improve-user-tabs	Alfredo Sumaran	2016-03-01	5	-24/+29
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Make url and actions to be the same name	Alfredo Sumaran	2016-03-01	1	-2/+2
\| \| \| \|
\| * \| \|	Respond with 'show' view. Tab content will be loaded dinamically	Alfredo Sumaran	2016-03-01	1	-3/+3
\| \| \| \|
\| * \| \|	Respond to .json requests	Alfredo Sumaran	2016-02-29	1	-3/+24
\| \| \| \|
\| * \| \|	Add routes and actions for dynamic tab loading	Josh Frye	2016-02-29	1	-7/+32
\| \| \| \|
* \| \| \|	Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'	Rémy Coutable	2016-03-02	1	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tag deletion doesn't use AJAX anymore See merge request !2986
\| * \| \| \|	Make the tags delete button remote in the tags listfix/13781-delete-tag-without-ajax	Rémy Coutable	2016-03-01	1	-1/+6
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' ↵	Douwe Maan	2016-03-02	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Don't show "Welcome to GitLab" when the search didn't return any projects Fixes #13785. /cc @pixdrift ### Before ![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png) ### After ![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png) See merge request !3059
\| * \| \| \|	Don't show "Welcome to GitLab" when the search didn't return any projects	Rémy Coutable	2016-03-02	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'	Douwe Maan	2016-03-02	1	-0/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix permissions for deprecated CI build status badge This fixes permissions for deprecated status badge, being unavailable even if project is public. Closes #13324 See merge request !3030
\| * \| \|	Do not require authentication for CI status badgefix/deprecated-ci-badge-permissions	Grzegorz Bizon	2016-03-01	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes only deprecated CI badge that we keep for backwards compatibility. See !3030#note_4041498.
\| * \| \|	Fix deprecated CI build status badge permissions	Grzegorz Bizon	2016-03-01	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'logged-out-search' into 'master'	Robert Speicher	2016-03-01	1	-0/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logged out search Fixes #13676 See merge request !3045
\| * \| \|	Enable search for logged-out users	Dmitriy Zaporozhets	2016-03-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'rs-improve-grace-period' into 'master'	Douwe Maan	2016-03-01	1	-5/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show any "2FA required" message if it's not actually required Prior, if the user had enabled and then disabled 2FA, they would be shown a "You must enable Two-factor Authentication for your account." message when going back to re-activate it, even if 2FA enforcement was disabled. See merge request !3014
\| * \| \|	Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-period	Robert Speicher	2016-02-29	1	-5/+7
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, if the user had enabled and then disabled 2FA, they would be shown a "You must enable Two-factor Authentication for your account." message when going back to re-activate it, even if 2FA enforcement was disabled.
* \| \|	Merge branch 'safe-content-type' into 'master'	Douwe Maan	2016-03-01	2	-12/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain why we mangle blob content types Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079 See merge request !2956
\| * \| \|	Explain why we mangle blob content typessafe-content-type	Jacob Vosmaer	2016-02-24	2	-12/+5
\| \| \| \|