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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fade out should be white instead of graysystem-notes-fade	Annabel Dunstone Gray	2016-12-07	1	-1/+1
\|
*	Merge branch '25209-improve-length-validators' into 'master'	Rémy Coutable	2016-12-07	7	-19/+31
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use :maximum instead of :within for length validators with a 0..N range Closes #25209 See merge request !7894
\| *	Use :maximum instead of :within for length validators with a 0..N range25209-improve-length-validators	Rémy Coutable	2016-12-06	7	-19/+31
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'excoveralls_coverage' into 'master'	Rémy Coutable	2016-12-07	1	-0/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add excoveralls in list of coverage examples See merge request !7906
\| * \|	Add excoveralls example	PotHix	2016-12-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There was no example for Elixir in gitlab-ci examples, this commit adds the missing example. excoveralls repository was pointing to an old example that doesn't exist anymore.
* \| \|	Merge branch 'remove-has-visible-content-caching' into 'master'	Douwe Maan	2016-12-07	1	-13/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove caching of Repository#has_visible_content? This MR removes the caching of `Repository#has_visible_content?`. The cache for this method is no longer necessary and this should solve the problem described in https://gitlab.com/gitlab-org/gitlab-ce/issues/25278. See merge request !7947
\| * \| \|	Remove caching of Repository#has_visible_content?remove-has-visible-content-caching	Yorick Peterse	2016-12-06	1	-13/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method already uses the cached method Repository#branch_count so there's no point in also caching has_visible_content?. Fixes gitlab-org/gitlab-ce#25278
* \| \| \|	Merge branch 'remove-pages-css' into 'master'	Jacob Schatz	2016-12-06	5	-35/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove more pages css * Moves award emojis to `/framework` * Moves generic image styles to `/framework` * Removes `confirmation.scss` See merge request !7952
\| * \ \ \	Merge branch 'master' into 'remove-pages-css'remove-pages-css	Annabel Dunstone Gray	2016-12-06	17	-250/+187
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/stylesheets/framework.scss
\| * \| \| \| \|	Remove confirmation.scss	Annabel Dunstone Gray	2016-12-06	2	-35/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Move award emojis to framwork	Annabel Dunstone Gray	2016-12-06	2	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Move image styles to framework	Annabel Dunstone Gray	2016-12-06	1	-0/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-dashboard-css' into 'master'	Jacob Schatz	2016-12-06	2	-49/+0
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove dashboard.scss See merge request !7960
\| * \| \| \| \|	Remove dashboard.scss	Annabel Dunstone Gray	2016-12-06	2	-49/+0
\| \|/ / / /
* \| \| \| \|	Merge branch 'remove-tags-scss' into 'master'	Jacob Schatz	2016-12-06	4	-57/+60
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tags.scss Remove `tags.scss` See merge request !7935
\| * \| \| \| \|	Remove tags.scssremove-tags-scss	Annabel Dunstone Gray	2016-12-06	4	-57/+60
\| \|/ / / /
* \| \| \| \|	Merge branch 'admin-scss' into 'master'	Jacob Schatz	2016-12-06	13	-193/+127
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove admin.scss Removes admin-specific CSS See merge request !7932
\| * \| \| \|	Remove admin.scssadmin-scss	Annabel Dunstone Gray	2016-12-05	11	-139/+99
\| \| \| \| \|
\| * \| \| \|	Truncate fix, remove unneeded admin-specific css	Annabel Dunstone Gray	2016-12-05	5	-54/+28
\| \| \| \| \|
* \| \| \| \|	Merge branch '23589-open-issue-for-mr' into 'master'	Sean McGivern	2016-12-06	14	-10/+157
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create an issue for all unresolved discussions in an MR See merge request !7180
\| * \| \| \| \|	Feature: delegate all open discussions to Issue	Bob Van Landuyt	2016-12-05	14	-10/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue.
* \| \| \| \| \|	Merge branch '24733-archived-project-merge-request-count' into 'master'	Sean McGivern	2016-12-06	5	-7/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Archived project merge requests add to group's Merge Requests Closes #24733 See merge request !7790
\| * \| \| \| \| \|	Fix Archived project merge requests add to group's Merge Requests	Jacopo	2016-12-05	5	-7/+19
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	counter This is done by: - Extending the IssuableFinder adding the non_archived option to the params - Overriding the #filter_params in the MergeRequestsAction - Passing the non_archived param in the nav/_group.html.haml navbar partial from the groups/merge_requests.html.haml
* \| \| \| \| \|	Merge branch 'zj-guest-reads-public-builds' into 'master'	Sean McGivern	2016-12-06	2	-3/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guests can read builds if those are public See merge request !6842
\| * \| \| \| \| \|	Update effected testszj-guest-reads-public-builds	Z.J. van de Weg	2016-12-04	1	-3/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Guests can read builds if those are public	Z.J. van de Weg	2016-12-04	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #18448
* \| \| \| \| \| \|	Merge branch 'refine-ci-statuses' into 'master'	Kamil Trzciński	2016-12-06	5	-7/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refine CI Statuses ## What does this MR do? This MR introduces classes for each relevant CI status. ## What are the relevant issue numbers? Closes #24273 See merge request !7889
\| * \| \| \| \| \| \|	Use detailed status as CSS class in pipelines list	Grzegorz Bizon	2016-12-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use status text when redering pipelines list	Grzegorz Bizon	2016-12-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve support for icons in new detailed statuses	Grzegorz Bizon	2016-12-06	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add status label information to pipeline header	Grzegorz Bizon	2016-12-06	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Untangle status label and text in ci status helper	Grzegorz Bizon	2016-12-06	1	-2/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Simplify ci status helper with detailed status	Grzegorz Bizon	2016-12-06	1	-22/+22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unsued variable from merge request widget	Grzegorz Bizon	2016-12-06	1	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Restore legacy statuses support in ci status helpers	Grzegorz Bizon	2016-12-06	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add support for detailed status to status helpers	Grzegorz Bizon	2016-12-05	3	-24/+36
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Expose pipeline detailed status using status factory	Grzegorz Bizon	2016-12-05	1	-0/+4
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'glm-shorthand-reference' into 'master'	Sean McGivern	2016-12-06	11	-73/+71
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GLM shorthand reference for projects from the same namespace Closes #21679 See merge request !7255
\| * \| \| \| \| \| \|	Add shorthand support to gitlab markdown references	Oswaldo Ferreira	2016-12-02	11	-73/+71
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/authorize-users-into-imported-gitlab-project' into 'master'	Sean McGivern	2016-12-06	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Authorize users into imported GitLab project https://gitlab.com/gitlab-com/support-forum/issues/1313 See merge request !7936
\| * \| \| \| \| \|	Authorize users into imported GitLab projectfix/authorize-users-into-imported-gitlab-project	Ahmad Sherif	2016-12-05	1	-0/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '25202-fix-mr-widget-content-wrapping' into 'master'	Jacob Schatz	2016-12-06	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed MR widget content wrapping for XS viewports Centers the "Accept Merge Request" button within the MR widget (and adds a bit of right/left padding) for viewports smaller than 768px. BEFORE: ![Screen_Shot_2016-12-02_at_8_53_01_AM](/uploads/fcdae5302a1407090483dd3cff868c51/Screen_Shot_2016-12-02_at_8_53_01_AM.png) AFTER: ![Screen_Shot_2016-12-02_at_9_43_37_AM](/uploads/f7d1dce082b79d263f05cea3c90e870a/Screen_Shot_2016-12-02_at_9_43_37_AM.png) cc: @markglenfletcher @annabeldunstone Closes #25202 See merge request !7900
\| * \| \| \| \| \|	Fixed MR widget content wrapping for XS viewports	Ryan Harris	2016-12-05	1	-0/+5
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merge_requests.scss Update merge_requests.scss to use padding shorthand Removed padding from Accept Merge Request button
* \| \| \| \| \|	Merge branch 'issue_25064' into 'security'	Douwe Maan	2016-12-06	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure state param has a valid value when filtering issuables. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25064 This fix makes sure we only call safe methods on issuable when filtering by state. See merge request !2038
* \| \| \| \| \|	Merge branch 'remove-errors-scss' into 'master'	Jacob Schatz	2016-12-05	1	-16/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused errors css `.error-page` isn't being used anywhere as far as I can see so I removed it See merge request !7933
\| * \| \| \| \| \|	Remove unused errors cssremove-errors-scss	Annabel Dunstone Gray	2016-12-05	1	-16/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-votes-scss' into 'master'	Jacob Schatz	2016-12-05	1	-4/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused votes.scss `.votes-inline` isn't being used anywhere See merge request !7934
\| * \| \| \| \| \|	Remove unused votes.scssremove-votes-scss	Annabel Dunstone Gray	2016-12-05	1	-4/+0
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'feature/admin-user-groups-link' into 'master'	Alfredo Sumaran	2016-12-05	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the 'Group projects' links clickable in the admin screens ## What does this MR do? This MR makes the group links within the 'users' section of the admin interface clickable. Currently, to view the details of groups a user is a member of, you have to go back to the 'groups' tab (which isn't ideal). ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? It's a UX improvement - it saves going back to the 'groups' a user is a member of and then clicking the group to view the group details. ## Screenshots (if relevant) ### Before ![Screenshot_from_2016-11-21_14-25-01](/uploads/2a6b75efd4c700e5760c64f0db17e847/Screenshot_from_2016-11-21_14-25-01.png) ### After ![Screenshot_from_2016-11-21_14-24-42](/uploads/9be288c1d9e4cf818c96e11e24790860/Screenshot_from_2016-11-21_14-24-42.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7620
\| * \| \| \| \|	The admin user projects view now has a clickable group link	James Gregory	2016-12-02	1	-1/+1
\| \| \| \| \| \|