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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Undo explicit conversion to Integer	Toon Claes	2017-03-20	2	-12/+28
\| \| \| \| \|	With the changes in Gitlab::VisibilityLevel it is no longer needed to explicit conversion to Integer in the controller itself.
*	Make level_value accept string integers	Toon Claes	2017-03-20	2	-2/+23
\| \| \| \| \| \| \|	When a VisibilityLevel is an integer formatted as a string, convert it to an integer, instead of looking it up in the hash map. When the value is not recognized, default to PRIVATE.
*	Make feature spec more robust	Toon Claes	2017-03-20	1	-2/+1
\| \| \| \|	Ensure the correct "Public" radio is selected by choosing it on ID.
*	Fix Error 500 when application settings are saved	Stan Hu	2017-03-18	3	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a Rails bug, fetching the application settings from Redis may prevent the attribute methods from being loaded for the `ApplicationSetting` model. More details here: https://github.com/rails/rails/issues/27348 There was also a secondary problem introduced by overriding these association methods which caused all default visibility levels to be set to `nil`. Before, the previous implementation allowed the string "20" to be saved as an integer, while now a table lookup happens before that. We fix this by enforcing the integer value in the controller and default to PRIVATE. Closes #29674
*	Merge branch '29586-pipelines-tabs' into 'master'	Annabel Dunstone Gray	2017-03-17	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove width from nav links Closes #29586 See merge request !10051
\| *	Remove width from nav links	Filipa Lacerda	2017-03-17	1	-1/+0
\| \|
* \|	Merge branch 'fixed-diff-avatar-tooltip-escaping' into 'master'	Filipa Lacerda	2017-03-17	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes diff comment avatar tooltip escaping issues Closes #29572 See merge request !10012
\| * \|	Fixes diff comment avatar tooltip escaping issuesfixed-diff-avatar-tooltip-escaping	Phil Hughes	2017-03-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are safe to use `data-html` because we never actually use HTML here, only the pure markdown Closes #29572
* \| \|	Merge branch '27477-refactor-notification-recipients' into 'master'	Rémy Coutable	2017-03-17	3	-305/+382
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Extract logic of who should receive notification into separate classes" Closes #27477 See merge request !9446
\| * \| \|	Resolve "Extract logic of who should receive notification into separate classes"	Dongqing Hu	2017-03-17	3	-305/+382
\|/ / /
* \| \|	Merge branch 'database-config-method' into 'master'	Rémy Coutable	2017-03-17	3	-6/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Gitlab::Database.config See merge request !10045
\| * \| \|	Added Gitlab::Database.config	Yorick Peterse	2017-03-17	3	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This returns the ActiveRecord configuration for the current environment. While CE doesn't use this very often, EE will use it in a few places for the database load balancing code. I'm adding this to CE so we don't end up with merge conflicts in this file.
* \| \| \|	Merge branch 'feature/use-gitaly-for-commit-show' into 'master'	Robert Speicher	2017-03-17	11	-7/+199
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly for CommitController#show See merge request !9629
\| * \| \| \|	Use Gitaly for CommitController#showfeature/use-gitaly-for-commit-show	Ahmad Sherif	2017-03-15	11	-7/+199
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/gb/gitlab-qa-start-page-cold-boot' into 'master'	Rémy Coutable	2017-03-17	1	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve GitLab QA cold boot problems on entry page See merge request !10003
\| * \| \| \| \|	Do not use Ruby Timeout module in GitLab QAfix/gb/gitlab-qa-start-page-cold-boot	Grzegorz Bizon	2017-03-17	1	-9/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Resolve GitLab QA cold boot problems on entry page	Grzegorz Bizon	2017-03-16	1	-2/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fl-remove-ujs-pipelines' into 'master'	Alfredo Sumaran	2017-03-17	48	-1380/+1790
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove UJS actions from pipelines tables Closes #20450, #28535, and #5580 See merge request !9929
\| * \| \| \| \| \|	Remove UJS actions from pipelines tables	Filipa Lacerda	2017-03-17	48	-1380/+1790
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix-time-sensitive-helper-spec' into 'master'	Robert Speicher	2017-03-17	1	-6/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix time-sensitive helper spec See merge request !10046
\| * \| \| \| \| \|	Fix time-sensitive helper spec	Rémy Coutable	2017-03-17	1	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '29557-fix-unicode-1-1' into 'master'	Clement Ho	2017-03-17	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Unicode 1.1 emojis Closes #29557 See merge request !10031
\| * \| \| \| \| \|	Fix Unicode 1.1 emojis29557-fix-unicode-1-1	Eric Eastwood	2017-03-16	1	-0/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29557 When using the full font-stack some the Unicode 1.1 emojis are taken up by fonts closer up the stack and don't represent the emoji well. ``` font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; ``` - On Windows, "Segoe UI" -> "Arial" takes over - On mac OS, "Helvetia" -> ".SF NS Display" takes over mac OS 10.12.3 \| Windows 10 --- \| --- ![](http://i.imgur.com/JI99zoH.png) \| ![](http://i.imgur.com/aek8G1X.png) --- When using a shorter emoji font-stack, everything seems to be covered well :tada: ``` font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; ``` - On Windows, "Segoe UI Emoji" takes over - On mac OS, "Apply Color Emoji" takes over mac OS 10.12.3 \| Windows 10 --- \| --- ![](http://i.imgur.com/bDwpGCw.png) \| ![](http://i.imgur.com/7kUwEJQ.png)
* \| \| \| \| \|	Merge branch '20121-add-a-new-have_html_escaped_body_text-matcher' into ↵	Robert Speicher	2017-03-17	2	-31/+37
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add a new have_html_escaped_body_text that match an HTML-escaped text Closes #20121 See merge request !10015
\| * \| \| \| \| \|	Add a new have_html_escaped_body_text that match an HTML-escaped text20121-add-a-new-have_html_escaped_body_text-matcher	Rémy Coutable	2017-03-17	2	-31/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This solves transient failures when a text contains HTML-escapable characters such as `'`. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'build-notification-null-check' into 'master'	Jacob Schatz	2017-03-17	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop CI notification showing when status is nil See merge request !10044
\| * \| \| \| \| \| \|	Stop CI notification showing when status is nilbuild-notification-null-check	Phil Hughes	2017-03-17	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-realtime-docs' into 'master'	Jacob Schatz	2017-03-17	1	-7/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates realtime documentation for the Frontend See merge request !10038
\| * \| \| \| \| \| \|	Updates realtime documentation for the Frontend	Filipa Lacerda	2017-03-17	1	-7/+14
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs/award_emojis' into 'master'	Sean Packham (GitLab)	2017-03-17	10	-65/+52
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor award emojis document Closes #29563 See merge request !10040
\| * \| \| \| \| \| \|	Refactor award emojis documentdocs/award_emojis	Achilleas Pipinellis	2017-03-17	10	-65/+52
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'boards-blank-state-template-in-js' into 'master'	Filipa Lacerda	2017-03-17	5	-62/+172
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards blank state template in JS file See merge request !9959
\| * \| \| \| \| \| \|	Fixed eslintboards-blank-state-template-in-js	Phil Hughes	2017-03-16	2	-6/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Catches errors when generating lists	Phil Hughes	2017-03-16	2	-0/+99
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Issue boards blank state template in JS file	Phil Hughes	2017-03-15	4	-62/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aim to eventually go to vue files
* \| \| \| \| \| \| \|	Merge branch '29577-restore-sub-nav-with-activity-tab' into 'master'	Rémy Coutable	2017-03-17	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore sub-nav (Activity) for empty project Closes #29577 See merge request !10033
\| * \| \| \| \| \| \|	Restore sub-nav for empty project29577-restore-sub-nav-with-activity-tab	Eric Eastwood	2017-03-16	1	-0/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29577
* \| \| \| \| \| \|	Merge branch 'add-labels-to-issue-hook' into 'master'	Sean McGivern	2017-03-17	5	-1/+32
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added labels to the issue web hook Closes #22313 See merge request !9972
\| * \| \| \| \| \| \|	Added labels to the issue web hook	Luke "Jared" Bennett	2017-03-17	5	-1/+32
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '29604-v3-fix-branch-creation' into 'master'	Sean McGivern	2017-03-17	3	-0/+77
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use "branch_name" instead "branch" on V3 branch creation API Closes #29604 See merge request !10030
\| * \| \| \| \| \| \| \|	Use "branch_name" instead "branch" on V3 branch creation API29604-v3-fix-branch-creation	Oswaldo Ferreira	2017-03-16	3	-0/+77
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '21451-allow-disable-mr-link' into 'master'	Sean McGivern	2017-03-17	9	-1/+73
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to disable Merge Request URL on push Closes #21451 See merge request !9663
\| * \| \| \| \| \| \| \| \|	Add ability to disable Merge Request URL on push	Alex Sanford	2017-03-17	9	-1/+73
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-03-17	3	-0/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'26470-branch-names-with-reference-prefixes-results-in-buggy-branches' into 'master' Strip reference prefixes on branch creation Closes #26470 See merge request !8498
\| * \| \| \| \| \| \| \| \|	Strip reference prefixes on branch creation	Matthieu Tardy	2017-01-09	3	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Matthieu Tardy <matthieu.tardy@gmail.com>
* \| \| \| \| \| \| \| \| \|	Add a documentation blurb to the new issue template to encourage writing ↵	Job van der Voort	2017-03-17	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(better) documentation.
\| * \| \| \| \| \| \| \| \| \|	documentation blurb in issue template	Job van der Voort	2017-03-17	1	-0/+10
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-make-email-static' into 'master'	Rémy Coutable	2017-03-17	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure alias email would never match original user See merge request !10037
\| * \| \| \| \| \| \| \| \|	Make sure alias email would never match:	Lin Jen-Shin	2017-03-17	1	-1/+3
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully this could fix: https://gitlab.com/gitlab-org/gitlab-ce/builds/12431186 To make sure that the email would never contain "joh" otherwise it would match to this `another_user`.
* \| \| \| \| \| \| \| \|	Merge branch 'fix-make-time-test-more-reliable' into 'master'	Rémy Coutable	2017-03-17	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the test less time sensitive by extending 0.2 days See merge request !10035