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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefault	Gabriel Mazetto	2016-08-06	13	-21/+18
\|
*	Merge branch 'repository-files-doc' into 'master'	Achilleas Pipinellis	2016-08-05	1	-0/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add examples to repository files API ## What does this MR do? Add examples to repository files API. ## Why was this MR needed? There were no examples. ## What are the relevant issue numbers? fixes #19779 See merge request !5465
\| *	Add examples to repository files API (!5465)	winniehell	2016-08-05	1	-0/+16
\| \|
* \|	Merge branch 'date-time-to-day-tests' into 'master'	Jacob Schatz	2016-08-05	1	-0/+31
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests to dateTime utility getDayName method ## What does this MR do? It was missing tests so i've created some tests to check the correct day name is returned See merge request !5324
\| * \|	Added tests to dateTime utility getDayName methoddate-time-to-day-tests	Phil Hughes	2016-07-18	1	-0/+31
\| \| \|
* \| \|	Merge branch 'issuable-dropdowns-changelog' into 'master'	Jacob Schatz	2016-08-05	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added changelog item for issuable form dropdowns ## What does this MR do? Adds CHANGELOG item about the new dropdowns in the issuable form See merge request !5266
\| * \| \|	Added changelog item for issuable form dropdowns	Phil Hughes	2016-08-05	1	-0/+3
\|/ / /
* \| \|	Merge branch 'ref-switcher-enter-submit' into 'master'	Jacob Schatz	2016-08-05	3	-20/+61
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed enter submitting form in dropdown ## What does this MR do? When searching for a branch in the ref switcher & then pressing enter it would submit the form without anything. This instead doesn't submit the form without anything being selected in the dropdown. Also improved the UX by making it submit with `Turoblinks` as currently no loading bar is shown so the user has no idea if anything is happening. ## What are the relevant issue numbers? Closes #19549 See merge request !5111
\| * \| \|	Underscore variable to camelCaseref-switcher-enter-submit	Phil Hughes	2016-08-04	1	-3/+2
\| \| \| \|
\| * \| \|	Fixed issue with `this` not being defined	Phil Hughes	2016-08-03	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'master' into ref-switcher-enter-submit	Phil Hughes	2016-08-03	972	-26297/+39264
\| \|\ \ \
\| * \| \| \|	Added ref switcher enter key tests	Phil Hughes	2016-07-19	1	-0/+29
\| \| \| \| \|
\| * \| \| \|	Fixed issue with filtering & pressing enter key	Phil Hughes	2016-07-19	1	-4/+2
\| \| \| \| \|
\| * \| \| \|	Prevent default on link click in ref switcher	Phil Hughes	2016-07-19	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Improve conditional	Alfredo Sumaran	2016-07-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed navigational keys not working when filtering	Phil Hughes	2016-07-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed enter submitting form in dropdown	Phil Hughes	2016-07-18	2	-28/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19549
* \| \| \| \|	Merge branch '19752-pipelines-finished-at' into 'master'	Jacob Schatz	2016-08-05	6	-8/+64
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update timeago to shorter representation ## What does this MR do? Shortens representation of `Finished at` block in pipelines & builds ## What are the relevant issue numbers? Closes #19752 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-14_at_8.54.44_AM](/uploads/85000549c49165d4481422eac5eb0ca9/Screen_Shot_2016-07-14_at_8.54.44_AM.png) See merge request !5225
\| * \| \| \| \|	Update timeago to shorter representation19752-pipelines-finished-at	Annabel Dunstone	2016-08-04	6	-8/+64
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '14202-compare-lazy-load-commits' into 'master'	Yorick Peterse	2016-08-05	3	-3/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab_git to lazy load compare commits See merge request !5667
\| * \| \| \| \| \|	Bump gitlab_git to lazy load compare commits14202-compare-lazy-load-commits	Paco Guzman	2016-08-05	3	-3/+4
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'database-guides' into 'master'	Achilleas Pipinellis	2016-08-05	2	-0/+154
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guide about what requires downtime ## What does this MR do? This MR adds a guide describing various SQL operations and whether they need downtime or not. ## Are there points in the code the reviewer needs to double check? Spalling and styling of the text mostly. ## Why was this MR needed? Developers aren't always aware of the impact of certain operations and the documentation of MySQL and PostgreSQL can be quite confusing at times. ## Screenshots (if relevant) ![screenshot](/uploads/d8afd4bd3755d26e4786dfafecfa9368/screenshot.png) <img src="https://emoji.slack-edge.com/T02592416/trollface/8c0ac4ae98.png" width="60" /> ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] All builds are passing - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5672
\| * \| \| \| \| \|	Added guide about migrations and downtimedatabase-guides	Yorick Peterse	2016-08-04	2	-0/+154
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This guide describes various commonly used operations and the impact they have on the availability of a GitLab instance.
* \| \| \| \| \| \|	Merge branch 'leading-slashes-relative-links' into 'master'	Rémy Coutable	2016-08-05	3	-1/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore URLs starting with // in Markdown links ## What does this MR do? Render `[foo](//bar/baz)` as `<a href="//bar/baz">foo</a>`. ## Why was this MR needed? `[foo](//bar/baz)` currently renders as `<a href="//bar/gitlab-org/gitlab-ce/master/baz">foo</a>` ## What are the relevant issue numbers? fixes #7032 See merge request !5677
\| * \| \| \| \| \| \|	Ignore URLs starting with // (!5677)	winniehell	2016-08-05	2	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add failing test for #7032	winniehell	2016-08-05	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'add_description_to_plain_text' into 'master'	Rémy Coutable	2016-08-05	3	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add issue description to txt/plain emails ## What does this MR do? Adds issue description to new_issue mail when in text/plain content-type ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Because clients that are rendering emails in text mode can see issue description ## What are the relevant issue numbers? #1821 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5663
\| * \| \| \| \| \| \| \|	Add description to text/plain emails	dixpac	2016-08-04	3	-0/+5
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added to * new_issue_email * new_merge_request_email
* \| \| \| \| \| \| \|	Merge branch 'side-by-side-unfold' into 'master'	Douwe Maan	2016-08-05	15	-89/+139
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add unfold links for Side-by-Side view ## What does this MR do? Add unfold links for Side-by-Side view and refactor some diff related code ## What are the relevant issue numbers? Closes #3877 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5415
\| * \| \| \| \| \| \| \|	Add unfold links for Side-by-Side view	Tim Masliuchenko	2016-08-04	15	-89/+139
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'upgrade-newrelic-rpm' into 'master'	Robert Speicher	2016-08-04	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318. ## What does this MR do? While we intend to remove newrelic in the future, it'll probably not happen until 9.0 due to. In the meantime, I'd like to update the gem so it won't block Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG ## Why was this MR needed? Rails 5 compatibility. Relevant issues: #14286, #12860 See merge request !5553
\| * \| \| \| \| \| \| \|	Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.upgrade-newrelic-rpm	Connor Shea	2016-07-28	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug fixes and compatibility with Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG
* \| \| \| \| \| \| \| \|	Merge branch '20621-avoid-lame-conflicts-in-ability-allowed' into 'master'	Robert Speicher	2016-08-04	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move abilities by subject class to a dedicated method ## What does this MR do? Twin of gitlab-org/gitlab-ee!622. It moves the `case` that returns abilities depending on the subject class to a dedicated method. This should avoid lame conflicts when CE to EE since the EE version assign the result of the `case` to a variable. ## What are the relevant issue numbers? Closes #20621. See merge request !5668
\| * \| \| \| \| \| \| \| \|	Move abilities by subject class to a dedicated method20621-avoid-lame-conflicts-in-ability-allowed	Rémy Coutable	2016-08-04	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will avoid lame conflicts when merging CE to EE Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch '20568-fix-member-data-again' into 'master'	Douwe Maan	2016-08-04	2	-1/+22
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a data migration to fix some missing timestamps in the members table (again) ## What does this MR do? Repeats an earlier migration to fix historic bad data in the members table (missing created_at and updated_at fields) ## Are there points in the code the reviewer needs to double check? I'm expecting the WHERE clauses to be fast enough, and to return few enough rows, that the migration doesn't need to use batches, but I'm not too familiar with the size of these tables in the wild, so perhaps that's a poor assumption. ## Why was this MR needed? 8.10 introduced a dependency on the `members.created_at` field in the project and namespace member view. If bad data is present, viewing the list of members now results in an NoMethodError and a 500 response from GitLab. Although the previous migration should have fixed all bad rows, we have evidence that it didn't in at least one case, despite the migration claiming to have run in the past. ## What are the relevant issue numbers? #20568 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #20568 See merge request !5670
\| * \| \| \| \| \| \| \| \|	Add missing DOWNTIME constant to the AddTimestampsToMembersAgain migration	Nick Thomas	2016-08-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a data migration to fix some missing timestamps in the members table (again)	Nick Thomas	2016-08-04	2	-1/+21
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'dz-improve-content-list' into 'master'	Dmitriy Zaporozhets	2016-08-04	4	-17/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set consistency in list text height css Fix line height of list row. Now its 42px everywhere. Before this merge request certain row height varied from 40 to 45px. Sometimes even inside one list. cc @jschatz1 @connorshea See merge request !5666
\| * \| \| \| \| \| \| \| \|	Remove unnecessary empty line after css vardz-improve-content-list	Dmitriy Zaporozhets	2016-08-04	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Set consistency in list text height css	Dmitriy Zaporozhets	2016-08-04	4	-17/+12
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch '20609-fix-protected-branch-access-levels-migration' into 'master'	Douwe Maan	2016-08-04	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate protected branch access levels to match constants in `Gitlab::Access` Closes #20606 Context: https://gitlab.com/gitlab-org/gitlab-ce/issues/20606#note_13561628 See merge request !5658
\| * \| \| \| \| \| \| \| \|	Migrate protected branch access levels to match constants in `Gitlab::Access`20609-fix-protected-branch-access-levels-migration	Timothy Andrew	2016-08-04	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- In the final round of review (!5081), we moved the protected branch access levels from Rails enums to constants from Gitlab::Access. - The migrations that moved us from the old data model (a single protected_branches table with developers_can_push and developers_can_merge flags) to the new one (separate tables for push_access_levels and merge_access_levels) was not updated. - These migrations still used 0 to mean "Masters" and 1 to mean "Developers" (matching the previous Rails enum), while Gitlab::Access uses 40 and 30 for these, respectively. - Once the migrations run, our data gets into a broken state. - We fix this by migrating all `0`s to `40` and all `1`s to `30`. - https://gitlab.com/gitlab-org/gitlab-ce/issues/20606#note_13561628 = Caveats = - In Gitlab::Access, 0 represents NO_ACCESS. When we run this migration, all protected branches with "No one" as an access level will be changed to "Masters"
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-add-column-with-default-null' into 'master'	Douwe Maan	2016-08-04	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `#down` for two protected branches-related migrations. - The migrations called `add_column_with_default` with a `null` option, which the Rails `add_column` method accepts. This fails because `add_column_with_default` expects an `allow_null` option instead. - The migrations have been fixed to use `allow_null`. See merge request !5660
\| * \| \| \| \| \| \| \| \| \|	Fix `#down` for two protected branches-related migrations.fix-add-column-with-default-null	Timothy Andrew	2016-08-04	2	-2/+2
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- The migrations called `add_column_with_default` with a `null` option, which the Rails `add_column` method accepts. This fails because `add_column_with_default` expects an `allow_null` option instead. - The migrations have been fixed to use `allow_null`.
* \| \| \| \| \| \| \| \| \|	Merge branch 'doc-artifacts-refactor' into 'master'	Achilleas Pipinellis	2016-08-04	14	-176/+222
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor build artifacts documentation ## What does this MR do? - Split user and admin documentation - Use new location paths - Add new Continuous Integration guide for the Admin area - Link to new guide from the Admin area ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20612 See merge request !5662
\| * \| \| \| \| \| \| \| \| \|	Fix relative URLdoc-artifacts-refactor	Achilleas Pipinellis	2016-08-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor build artifacts documentation	Achilleas Pipinellis	2016-08-04	14	-176/+222
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Split user and admin documentation - Use new location paths - Add new Continuous Integration guide for the Admin area - Link to new guide from the Admin area
* \| \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.10.4	Rémy Coutable	2016-08-04	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq	Rémy Coutable	2016-08-04	2	-1/+14
\|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master'	Rémy Coutable	2016-08-04	2	-1/+14
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don’t close issues on original project Closes #20527 -> https://gitlab.com/gitlab-org/gitlab-ce/issues/20527 See merge request !1981