summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'async-new-branch-button' into 'master' Jacob Schatz2016-04-287-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 asynchronouslyYorick Peterse2016-04-287-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 Schatz2016-04-283-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-uiPhil Hughes2016-04-265-59/+77
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14027
* | | | | | | | | | | | | | Merge branch 'project-webhooks-ui' into 'master' Jacob Schatz2016-04-284-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-uiPhil Hughes2016-04-261-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Project webhooks updated UIPhil Hughes2016-04-263-85/+101
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13993
* | | | | | | | | | | | | | Merge branch 'project-deploy-keys-ui' into 'master' Jacob Schatz2016-04-287-104/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project deploy keys updated UI Closes #13992 See merge request !3912
| * | | | | | | | | | | | | Updated tests for deploy keysproject-deploy-keys-uiPhil Hughes2016-04-253-14/+11
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Project deploy keys updated UIPhil Hughes2016-04-255-97/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13992
* | | | | | | | | | | | | | Merge branch 'scss-url-linters' into 'master' Jacob Schatz2016-04-281-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 Shea2016-04-161-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'changelog-update' into 'master' Jacob Schatz2016-04-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Safari search box bug fix to changelog See merge request !3951
| * | | | | | | | | | | | | | Add Safari search box bug fix to changelogAnnabel Dunstone2016-04-271-0/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'updated-triggers-ui' into 'master' Jacob Schatz2016-04-283-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-uiPhil Hughes2016-04-273-66/+63
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14090
* | | | | | | | | | | | | | Merge branch 'project-group-ui' into 'master' Jacob Schatz2016-04-289-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-uiPhil Hughes2016-04-272-2/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed failing testsPhil Hughes2016-04-251-4/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Updated select box to match designPhil Hughes2016-04-252-1/+21
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Updated project group sharing UIPhil Hughes2016-04-258-62/+72
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13991
* | | | | | | | | | | | | | Merge branch 'todos-tests-fix' into 'master' Robert Speicher2016-04-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Todos test Another attempt to fix random fail on Todos test. See merge request !3953
| * | | | | | | | | | | | | | Fix Todos testtodos-tests-fixAlfredo Sumaran2016-04-271-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'navigation-redesign' into 'master' Dmitriy Zaporozhets2016-04-283-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 colorsDmitriy Zaporozhets2016-04-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | | Make layout navigation gray and fluidnavigation-redesignDmitriy Zaporozhets2016-04-282-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | | Make application header light grayDmitriy Zaporozhets2016-04-281-2/+2
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | Merge branch 'initd_gitlab_workhorse_rename' into 'master' Jacob Vosmaer (GitLab)2016-04-281-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_renameAchilleas Pipinellis2016-04-281-6/+6
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'allow-disabling-of-rack-attack' into 'master' Rémy Coutable2016-04-282-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 fileStan Hu2016-04-272-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-281-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-numbersKelvin2016-03-041-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'fix/ci-skipped-status' into 'master' Rémy Coutable2016-04-284-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 consistencyGrzegorz Bizon2016-04-281-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add Changelog entry for build status canceled fixGrzegorz Bizon2016-04-281-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add tests exercising builds scheduler after cancelGrzegorz Bizon2016-04-281-0/+18
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Refactor ci commit specs by adding context blocksGrzegorz Bizon2016-04-281-77/+85
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Render canceled status if any of the jobs canceledGrzegorz Bizon2016-04-272-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 Coutable2016-04-284-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 checkingStan Hu2016-04-274-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 Coutable2016-04-281-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 pageAchilleas Pipinellis2016-04-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | Users can use the feature proposal label inside the issuelabel_feature_proposalAchilleas Pipinellis2016-04-281-2/+3
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch 'admin-email-frequency' into 'master' Jacob Vosmaer2016-04-282-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 dailyJacob Vosmaer2016-04-262-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 Pipinellis2016-04-281-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-documentationAchilleas Pipinellis2016-04-281-13/+24
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update using_docker_build.md, clarify the 'privileged' mode requirementTomasz Maczukin2016-04-251-16/+48
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch 'fix-github-enterprise-imports' into 'master' Rémy Coutable2016-04-288-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