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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added performance guidelinesperformance-guide	Yorick Peterse	2016-04-30	2	-0/+259
\| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#15254 gitlab-org/gitlab-ce#14277 [ci skip]
*	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
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add tests exercising builds scheduler after cancel	Grzegorz Bizon	2016-04-28	1	-0/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refactor ci commit specs by adding context blocks	Grzegorz Bizon	2016-04-28	1	-77/+85
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Render canceled status if any of the jobs canceled	Grzegorz Bizon	2016-04-27	2	-1/+27
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This status will be returned only when there are no failed jobs that are not allowed to fail.
* \| \| \| \| \| \| \|	Merge branch 'use-remote-ip-for-akismet' into 'master'	Rémy Coutable	2016-04-28	4	-5/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use ActionDispatch Remote IP for Akismet checking Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629 See merge request !3961
\| * \| \| \| \| \| \| \|	Use ActionDispatch Remote IP for Akismet checking	Stan Hu	2016-04-27	4	-5/+14
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629
* \| \| \| \| \| \| \|	Merge branch 'label_feature_proposal' into 'master'	Rémy Coutable	2016-04-28	1	-6/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users can use the feature proposal label inside the issue Got the idea from https://gitlab.com/gitlab-org/gitlab-ce/issues/12620. \cc @JobV @sytses See merge request !2574
\| * \| \| \| \| \| \| \|	Fix links to core team page	Achilleas Pipinellis	2016-04-28	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Users can use the feature proposal label inside the issuelabel_feature_proposal	Achilleas Pipinellis	2016-04-28	1	-2/+3
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'admin-email-frequency' into 'master'	Jacob Vosmaer	2016-04-28	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send 'admin emails' weekly, not daily Daily seems to be to spammy, so let's default to weekly instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15520 See merge request !3923
\| * \| \| \| \| \| \| \|	Send 'admin emails' weekly, not daily	Jacob Vosmaer	2016-04-26	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Daily seems to be to spammy, so let's default to weekly instead.
* \| \| \| \| \| \| \| \|	Merge branch 'fix/docker-in-docker-ci-documentation' into 'master'	Achilleas Pipinellis	2016-04-28	1	-20/+63
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update using_docker_build.md, clarify the 'privileged' mode requirement Related to #15428 Fixes gitlab-org/gitlab-ci-multi-runner#1261 See merge request !3909
\| * \| \| \| \| \| \| \| \|	Copyedit `using_docker_build.md` and fix linksfix/docker-in-docker-ci-documentation	Achilleas Pipinellis	2016-04-28	1	-13/+24
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update using_docker_build.md, clarify the 'privileged' mode requirement	Tomasz Maczukin	2016-04-25	1	-16/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-github-enterprise-imports' into 'master'	Rémy Coutable	2016-04-28	8	-10/+101
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport GitHub Enterprise import support from EE These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations. See merge request !3892
\| * \| \| \| \| \| \| \| \|	Fixes for review of GitHub Enterprise backport changes	Stan Hu	2016-04-26	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Backport GitHub Enterprise import support from EE	Stan Hu	2016-04-26	8	-10/+101
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
* \| \| \| \| \| \| \| \|	Merge branch 'add-js-prefix-to-user-tab-classes' into 'master'	Jacob Schatz	2016-04-27	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add JS prefix to user tab classes ## What does this MR do This MR adds the `js-` prefix to the classes which are used for js purposes only. This MR only affects the said classes inside `users/show.html.haml`. ## Are there points in the code the reviewer needs to double check? I'm not entirely sure if this project uses the `js-` prefix for classes that are used for js purposes only. Doing a grep shows some of the classes have the prefix, but I'm still unsure whether this project follows this rule. ## Why was this MR needed? As I was working thru #13401, I wanted to add a tab on the user profile page to show the contributions outside the GitLab instance. Reading the JS, I came across this. This MR helps new people reading the code that the said classes are for js purposes only. Also, it helps the project work toward to uniform class naming. I suggest that we document adding the `js-` prefix to classes for js purposes only (if this is the case for this project) See merge request !3928
\| * \| \| \| \| \| \| \|	Add JS prefix to user tab classes	Karlo Soriano	2016-04-26	2	-4/+4
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm not entirely sure if this project uses the `js-` prefix for classes that are for js purposes only. But as I was working on a feature, I noticed that these classes were those kind of classes.
* \| \| \| \| \| \| \|	Merge branch 'trigger-query-string' into 'master'	Achilleas Pipinellis	2016-04-27	1	-0/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API doc example with query string for triggering build Make this explicit to prevent confusion as we saw in gitlab-org/gitlab-ci#413. See merge request !3947
\| * \| \| \| \| \| \| \|	Add API doc example with query string for triggering build	David de Boer	2016-04-27	1	-0/+6
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-operations-doc' into 'master'	Achilleas Pipinellis	2016-04-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sidekiq MemoryKiller sends a `SIGKILL` signal, not `SIGTERM` As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/f127edd012bd8b6f76ac67d69aadbd7d4837258f/lib/gitlab/sidekiq_middleware/memory_killer.rb#L10 (this was changed by c291ff9c6f795821e5b73447984e4cd72f3701a4). See merge request !3927
\| * \| \| \| \| \| \| \|	Sidekiq MemoryKiller sends a `SIGKILL` signal, not `SIGTERM`fix-operations-doc	Rémy Coutable	2016-04-26	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'project-dropdown-tests' into 'master'	Jacob Schatz	2016-04-27	1	-0/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project title dropdown tests Added a test for when on an issue page to check whether the project dropdown links will still work See !3870 See merge request !3921
\| * \| \| \| \| \| \| \|	Project title dropdown testsproject-dropdown-tests	Phil Hughes	2016-04-26	1	-0/+27
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a test for when on an issue page to check whether the project dropdown links will still work See !3870
* \| \| \| \| \| \| \|	Merge branch 'sidebar-label-link' into 'master'	Jacob Schatz	2016-04-27	3	-6/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated label links to work correctly for filtering See !3846#note_5033951 See merge request !3920