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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-07-13	70	-257/+487
\|\
\| *	Merge branch 'multi-line-inline-diff' into 'master'	Douwe Maan	2016-07-13	3	-24/+57
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render inline diffs for multiple changed lines following eachother Before: ![Screen_Shot_2016-07-11_at_00.08.27](/uploads/b14664211e0f5cef6e77a78eadfcbcdf/Screen_Shot_2016-07-11_at_00.08.27.png) After: ![Screen_Shot_2016-07-11_at_00.07.34](/uploads/567be631869a4867a2edf6ff7eda6369/Screen_Shot_2016-07-11_at_00.07.34.png) See merge request !5174
\| \| *	Rename constant to be more descriptive	Douwe Maan	2016-07-13	1	-2/+2
\| \| \|
\| \| *	Extended regexes ignore whitespace, so use \smulti-line-inline-diff	Douwe Maan	2016-07-12	1	-2/+2
\| \| \|
\| \| *	Render inline diffs for multiple changed lines following eachother	Douwe Maan	2016-07-11	3	-24/+57
\| \| \|
\| * \|	Merge branch 'jacobvosmaer-gitlab/gitlab-ce-strict-host-headers'	Douwe Maan	2016-07-12	3	-2/+16
\| \|\ \
\| \| * \|	Defend against 'Host' header injection	Jacob Vosmaer	2016-07-12	3	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17877 . This change adds 'defense in depth' against 'Host' HTTP header injection. It affects normal users in the following way. Suppose your GitLab server has IP address 1.2.3.4 and hostname gitlab.example.com. Currently, if you enter 1.2.3.4 in your browser, you get redirected to 1.2.3.4/users/sign_in. After this change, you get redirected from 1.2.3.4 to gitlab.example.com/users/sign_in. This is because the address you typed in the address bar of your browser ('1.2.3.4'), which gets stored in the 'Host' header, is now being overwritten to 'gitlab.example.com' in NGINX. In this change we also make NGINX clear the 'X-Forwarded-Host' header because Ruby on Rails also uses that header the same wayas the 'Host' header. We think that for most GitLab servers this is the right behavior, and if not then administrators can change this behavior themselves at the NGINX level.
\| * \| \|	Merge branch '19693-emoji-awards-aren-t-deleted-for-deleted-users' into ↵	Douwe Maan	2016-07-12	4	-3/+25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Delete award emoji when deleting a user ## What does this MR do? Fix the problem where a user's award emoji aren't deleted when the user is deleted. ## Are there points in the code the reviewer needs to double check? The corresponding SELECT for the migration runs in 0.3s on staging, but I can't test the delete there or on production easily. It should be reasonably quick. ## Why was this MR needed? There was a typo in an association :scream: ## What are the relevant issue numbers? Closes #19693. ## Screenshots (if relevant) Nope. ## 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~~ - [ ] 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 !5216
\| \| * \| \|	Delete award emoji when deleting a user19693-emoji-awards-aren-t-deleted-for-deleted-users	Sean McGivern	2016-07-12	4	-3/+25
\| \| \| \| \|
\| * \| \| \|	Merge branch '17702-running-icon' into 'master'	Jacob Schatz	2016-07-12	4	-6/+18
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change running status color to blue; update icon to spinner ## What does this MR do? Changes running status color to blue Updates icon to spinner to differentiate from `pending` ## What are the relevant issue numbers? Closes #17702 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-12_at_4.34.48_PM](/uploads/8f6bb36a7a8fe99db1ec1ef8e9db6388/Screen_Shot_2016-07-12_at_4.34.48_PM.png) See merge request !5222
\| \| * \| \| \|	Update CHANGELOG17702-running-icon	Annabel Dunstone	2016-07-12	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Change running status color to blue; update icon to spinner	Annabel Dunstone	2016-07-12	3	-6/+17
\| \|/ / / /
\| * \| \| \|	Merge branch '19708-label-selection-clutter' into 'master'	Jacob Schatz	2016-07-12	1	-1/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add margin to filter labels ## What does this MR do? Adds margin to filter labels ## Why was this MR needed? It was pretty ugly before ## What are the relevant issue numbers? Closes #19708 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_4.42.05_PM](/uploads/55c049e442a16a06c14bb9394137cc87/Screen_Shot_2016-07-11_at_4.42.05_PM.png) See merge request !5194
\| \| * \| \| \|	Add margin to filter labels19708-label-selection-clutter	Annabel Dunstone	2016-07-11	1	-1/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '19692-gray-block' into 'master'	Jacob Schatz	2016-07-12	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update header block class on snippets page ## What does this MR do? Changes gray block in `Snippets` to new white sub header style ## What are the relevant issue numbers? Closes #19692 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_4.17.10_PM](/uploads/f4cea2d019d30fc7c6adc7e3b26590b4/Screen_Shot_2016-07-11_at_4.17.10_PM.png) See merge request !5192
\| \| * \| \| \| \|	Update header block class on snippets page19692-gray-block	Annabel Dunstone	2016-07-11	1	-1/+1
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch '17760-pipeline-builds-design' into 'master'	Jacob Schatz	2016-07-12	17	-119/+262
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Design updates for Builds & Pipelines" ## What does this MR do? Updates pipelines design ## What are the relevant issue numbers? Part of #18920 Closes #17760 Closes #18479 Closes #19618 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_2.44.22_PM](/uploads/5048928d86093802d84c3bd7f7c5dc85/Screen_Shot_2016-07-11_at_2.44.22_PM.png) ![Screen_Shot_2016-07-11_at_2.32.17_PM](/uploads/a7ab94c8042d33bd06ef633f62bf1c99/Screen_Shot_2016-07-11_at_2.32.17_PM.png) ![Screen_Shot_2016-07-11_at_2.44.43_PM](/uploads/8aa63229ad75d373c30f342d5c86c007/Screen_Shot_2016-07-11_at_2.44.43_PM.png) See merge request !5156
\| \| * \| \| \| \|	Update duration representation on builds pages	Annabel Dunstone	2016-07-12	2	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update CHANGELOG	Annabel Dunstone	2016-07-12	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix label alignment bug; re-add build-link	Annabel Dunstone	2016-07-12	3	-17/+20
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add new stopwatch and commit icons; rename custom icon helper; fix commit ↵	Annabel Dunstone	2016-07-12	9	-15/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pipeline layout
\| \| * \| \| \| \|	Rearrange and update admin builds	Annabel Dunstone	2016-07-12	4	-48/+47
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update builds page	Annabel Dunstone	2016-07-12	3	-57/+56
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add link to pipline ID	Annabel Dunstone	2016-07-12	1	-1/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add empty deploy dropdown button	Annabel Dunstone	2016-07-12	2	-9/+46
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Set width on stage columns; min width on table with scroll on mobile; add ↵	Annabel Dunstone	2016-07-12	6	-46/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	avatar to commit column
\| \| * \| \| \| \|	Move pipeline ID to commit column; add status; branch style updates	Annabel Dunstone	2016-07-12	3	-7/+38
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add clock and calendar icons for duration and finished at; add finished at ↵	Annabel Dunstone	2016-07-12	3	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	section in pipelines
\| * \| \| \| \| \|	Merge branch 'rs-delimit-done-todos' into 'master'	Robert Speicher	2016-07-12	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use number_with_delimiter for Todos pending/done tab counts See merge request !5199
\| \| * \| \| \| \| \|	Use number_with_delimiter for Todos pending/done tab counts	Robert Speicher	2016-07-12	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'rs-describe-symbols' into 'master'	Robert Speicher	2016-07-12	40	-98/+98
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid `describe`-ing symbols in specs See merge request !5195
\| \| * \| \| \| \| \| \|	Avoid `describe`-ing symbols in specsrs-describe-symbols	Robert Speicher	2016-07-12	41	-110/+110
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '18935-pipeline-button' into 'master'	Jacob Schatz	2016-07-12	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change new pipeline to run pipeline ## What does this MR do? Change text of button from `New pipeline` to `Run pipeline` ## What are the relevant issue numbers? Closes #18935 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-06_at_12.15.36_PM](/uploads/2e0413b802118781dc5a29c7f1c105b8/Screen_Shot_2016-07-06_at_12.15.36_PM.png) See merge request !5119
\| \| * \| \| \| \| \| \|	Change new pipeline to run pipeline18935-pipeline-button	Annabel Dunstone	2016-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'add-2fa-check-to-oauth' into 'master'	Robert Speicher	2016-07-12	4	-6/+78
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 2FA check to the OAuth authentication mechanism Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/19312 2FA checks were not being performed when logging in via any of the OAuth providers. Just LDAP had the check. This MR fixes that. See merge request !1976
\| * \| \| \| \| \| \| \|	Refactor `mock_auth_hash`	Patricio Cano	2016-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added a lot of stubbing to make sure OAUth requests are handled properly ↵	Patricio Cano	2016-07-07	4	-3/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with 2FA
\| * \| \| \| \| \| \| \|	Move Omniauth specific setup to its own file	Patricio Cano	2016-07-07	2	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change order of stubbing to fix tests	Patricio Cano	2016-07-04	2	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added tests for 2FA check on OAuth request	Patricio Cano	2016-07-04	4	-7/+53
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add 2FA check to the OAuth authentication mechanism	Patricio Cano	2016-06-29	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.9.6	Robert Speicher	2016-07-12	1	-2/+5
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'approval-required-todo' into 'master'	Robert Speicher	2016-07-12	5	-7/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add approval required todos Ports the 'approval required' todo type from EE - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/547 See merge request !5217
\| * \| \| \| \| \| \| \|	Add approval required todosapproval-required-todo	Sean McGivern	2016-07-12	5	-7/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '19659-sidebar-improvements' into 'master'	Jacob Schatz	2016-07-12	5	-56/+37
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Possible sidebar improvements based" ## What does this MR do? Cleans up the sidebar ## Are there points in the code the reviewer needs to double check? @dzaporozhets it looks like your screenshot has more padding on the left and right of the sidebar, but if you do that then the hamburger icon doesn't match the placement on the top nav, and it makes it look like icon is shifting back and forth. ## What are the relevant issue numbers? Part of #19659 ## Screenshots (if relevant) ![nav](/uploads/693d8a21bac464fc7dd40a51cb7dccda/nav.gif) See merge request !5211
\| * \| \| \| \| \| \| \| \|	Change sidebar drop shadow to rgba19659-sidebar-improvements	Annabel Dunstone	2016-07-12	2	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove toggle partial; Move pin link to top of side nav	Annabel Dunstone	2016-07-12	4	-35/+38
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove icons from sidebar; remove darker theme color from pin & toggle buttons	Annabel Dunstone	2016-07-12	3	-22/+1
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove-hound-config' into 'master'	Stan Hu	2016-07-12	3	-99/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Hound CI and Teatro config ## What does this MR do? Since we moved to gitlab.com we don't use Hound CI and Teatro anymore. Instead we have rubocop. See merge request !5089
\| * \| \| \| \| \| \| \|	Remove teatro configremove-hound-config	Robert Schilling	2016-07-05	2	-95/+0
\| \| \| \| \| \| \| \| \|