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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Simplify specs by not over-expecting15527-fix-wiki-page-creation-issue	Rémy Coutable	2016-05-02	3	-29/+23
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Fix error when trying to create a wiki page	Rémy Coutable	2016-04-29	5	-4/+139
\| \| \| \| \| \|	Closes #15527. Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'gitattributes' into 'master'	Rémy Coutable	2016-04-29	8	-16/+77
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support supressing text file diffs on the default branch with .gitattributes This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch. When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed. ![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png) I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`. Fixes and closes gitlab-org/gitlab-ce#2315. See merge request !3806
\| *	Support supressing text file diffs on the default branch with .gitattributes	Matt Oakes	2016-04-29	8	-16/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a combination of 3 commits. - Update the bare repositories info/attributes if the default branch is updated - Check the diff attributes of a file before showing a diff - Update CHANGELOG
* \|	Merge branch 'fix/remove-deprecated-ci-helper' into 'master'	Rémy Coutable	2016-04-29	1	-13/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated CI badge helper Closes #13446 See merge request !3977
\| * \|	Remove deprecated CI badge helper	Grzegorz Bizon	2016-04-29	1	-13/+0
\| \|/ \| \| \| \| \| \|	Closes #13446
* \|	Merge branch 'change_message_for_newly_created_milestone' into 'master'	Rémy Coutable	2016-04-29	4	-3/+42
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a better message when milestone is newly created closes #14982 See merge request !3925
\| * \|	Use a better message when milestone is newly createdchange_message_for_newly_created_milestone	Arinde Eniola	2016-04-29	4	-3/+42
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make some changes for the checks to determine when the messages should be displayed add item to changelog and also integration test make some changes to the test make some changes
* \|	Merge branch 'fix-changelog' into 'master'	Yorick Peterse	2016-04-29	1	-2/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed CHANGELOG for 8.7.1/8.7.2 See merge request !3978
\| * \|	Fixed CHANGELOG for 8.7.1/8.7.2	Yorick Peterse	2016-04-29	1	-2/+4
\|/ / \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'dz-update-outdated-colors' into 'master'	Jacob Schatz	2016-04-29	2	-3/+3
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Replace outdated bluish colors with default bg color cc @skyruler See merge request !3973
\| *	Replace outdated bluish colors with default bg colordz-update-outdated-colors	Dmitriy Zaporozhets	2016-04-28	2	-3/+3
\| \|
* \|	Merge branch 'zj-large-files-no-highlight' into 'master'	Robert Speicher	2016-04-28	7	-16/+44
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Properly handle bigger files Closes #3967 See merge request !3718
\| *	Properly handle bigger files	Zeger-Jan van de Weg	2016-04-28	7	-16/+44
\| \|
* \|	Merge branch 'async-new-branch-button' into 'master'	Jacob Schatz	2016-04-28	7	-11/+62
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load the "New Branch" button asynchronously Here's how it looks like for logged in users: ![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif) And here it is for anonymous users (or when a new branch can't be created by a logged in user): ![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif) See merge request !3855
\| * \|	Load the "New Branch" button asynchronously	Yorick Peterse	2016-04-28	7	-11/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This button depends on Issue#can_be_worked_on? which in turn depends on Issue#related_branches. By rendering this button asynchronously we can finally remove all usages of Issue#related_branches and Issue#referenced_merge_requests from the issues "show" page.
* \| \|	Merge branch 'protected-branches-ui' into 'master'	Jacob Schatz	2016-04-28	3	-59/+72
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Protected branches UI ![Screen_Shot_2016-04-26_at_15.50.10](/uploads/4b905db031aab412bc01616e0be36c1b/Screen_Shot_2016-04-26_at_15.50.10.png) ![Screen_Shot_2016-04-26_at_15.50.00](/uploads/b09229b364ec5361fce375299d39d99c/Screen_Shot_2016-04-26_at_15.50.00.png) Closes #14027 See merge request !3929
\| * \| \|	Protected branches UIprotected-branches-ui	Phil Hughes	2016-04-26	5	-59/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14027
* \| \| \|	Merge branch 'project-webhooks-ui' into 'master'	Jacob Schatz	2016-04-28	4	-87/+103
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project webhooks updated UI Closes #13993 ![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png) ![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png) See merge request !3922
\| * \| \| \|	Updated testsproject-webhooks-ui	Phil Hughes	2016-04-26	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Project webhooks updated UI	Phil Hughes	2016-04-26	3	-85/+101
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13993
* \| \| \|	Merge branch 'project-deploy-keys-ui' into 'master'	Jacob Schatz	2016-04-28	7	-104/+114
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project deploy keys updated UI Closes #13992 See merge request !3912
\| * \| \|	Updated tests for deploy keysproject-deploy-keys-ui	Phil Hughes	2016-04-25	3	-14/+11
\| \| \| \|
\| * \| \|	Project deploy keys updated UI	Phil Hughes	2016-04-25	5	-97/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13992
* \| \| \|	Merge branch 'scss-url-linters' into 'master'	Jacob Schatz	2016-04-28	1	-2/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable the UrlFormat and UrlQuotes SCSS Linters. There were no lints to fix for this one, so it's just preventative. UrlFormat: URLs should be valid and not contain protocols or domain names. UrlQuotes: URLs should always be enclosed within quotes. cc: @jschatz1 See merge request !3770
\| * \| \|	Enable the UrlFormat and UrlQuotes SCSS Linters.	Connor Shea	2016-04-16	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'changelog-update' into 'master'	Jacob Schatz	2016-04-28	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Safari search box bug fix to changelog See merge request !3951
\| * \| \| \|	Add Safari search box bug fix to changelog	Annabel Dunstone	2016-04-27	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'updated-triggers-ui' into 'master'	Jacob Schatz	2016-04-28	3	-66/+63
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated triggers UI ![Screen_Shot_2016-04-27_at_14.05.35](/uploads/971bc907f62abd397368c8c088ff0cf1/Screen_Shot_2016-04-27_at_14.05.35.png) ![Screen_Shot_2016-04-27_at_14.05.32](/uploads/5e0e87998e25e7e89cdd6fb8d6035542/Screen_Shot_2016-04-27_at_14.05.32.png) Closes #14090 See merge request !3946
\| * \| \| \| \|	Updated triggers UIupdated-triggers-ui	Phil Hughes	2016-04-27	3	-66/+63
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14090
* \| \| \| \|	Merge branch 'project-group-ui' into 'master'	Jacob Schatz	2016-04-28	9	-62/+89
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project group UI Closes #13991 ![Screen_Shot_2016-04-25_at_14.54.49](/uploads/e55fd1731a479d93660a1ff8359f56d6/Screen_Shot_2016-04-25_at_14.54.49.png) See merge request !3911
\| * \| \| \| \|	Changed settings icon color variableproject-group-ui	Phil Hughes	2016-04-27	2	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed failing tests	Phil Hughes	2016-04-25	1	-4/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Updated select box to match design	Phil Hughes	2016-04-25	2	-1/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Updated project group sharing UI	Phil Hughes	2016-04-25	8	-62/+72
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13991
* \| \| \| \|	Merge branch 'todos-tests-fix' into 'master'	Robert Speicher	2016-04-28	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Todos test Another attempt to fix random fail on Todos test. See merge request !3953
\| * \| \| \| \|	Fix Todos testtodos-tests-fix	Alfredo Sumaran	2016-04-27	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'navigation-redesign' into 'master'	Dmitriy Zaporozhets	2016-04-28	3	-7/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grey header and fluid profile navigation Based on https://gitlab.com/gitlab-org/gitlab-ce/issues/14838#note_5083863 cc @skyruler See merge request !3968
\| * \| \| \| \| \|	Reuse more popular colors	Dmitriy Zaporozhets	2016-04-28	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Make layout navigation gray and fluidnavigation-redesign	Dmitriy Zaporozhets	2016-04-28	2	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Make application header light gray	Dmitriy Zaporozhets	2016-04-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'initd_gitlab_workhorse_rename' into 'master'	Jacob Vosmaer (GitLab)	2016-04-28	1	-6/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace gitlab-workhorse with GitLab Workhorse where appropriate For the output to be consistent with the other services. See merge request !2512
\| * \| \| \| \| \| \|	Replace gitlab-workhorse with GitLab Workhorse where appropriateinitd_gitlab_workhorse_rename	Achilleas Pipinellis	2016-04-28	1	-6/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'allow-disabling-of-rack-attack' into 'master'	Rémy Coutable	2016-04-28	2	-2/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable Rack Attack if admin disables it in config file Grack::Auth already checks this variable. These holdouts were not disabled, leading to confusion when debugging a customer issue. See merge request !3918
\| * \| \| \| \| \| \|	Disable Rack Attack if admin disables it in config file	Stan Hu	2016-04-27	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grack::Auth already checks this variable. These holdouts were not disabled, leading to confusion when debugging a customer issue.
* \| \| \| \| \| \| \|	Merge branch 'prepend-letter-v-to-workhorse-version-numbers' into 'master'	Jacob Vosmaer (GitLab)	2016-04-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepend letter v to GitLab Workhorse version numbers This helps to address gitlab-org/gitlab-ce#12684 so as to maintain consistency in all GitLab projects. It also addresses: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/4 Next Steps - create a set of duplicate tags in workhorse to prevent errors when updating from the patch guide See merge request !3088
\| * \| \| \| \| \| \| \|	Prepend letter v to GitLab Workhorse version numbersprepend-letter-v-to-workhorse-version-numbers	Kelvin	2016-03-04	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/ci-skipped-status' into 'master'	Rémy Coutable	2016-04-28	4	-75/+128
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build status `canceled` if any of the jobs canceled Before this change in case of any of the jobs had been canceled, build status was `failed`. Closes #14207 See merge request !3778
\| * \| \| \| \| \| \| \| \|	Reorder asserts is ci commits specs for consistency	Grzegorz Bizon	2016-04-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add Changelog entry for build status canceled fix	Grzegorz Bizon	2016-04-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \|