summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ci-tables-ui-improvementsci-tables-ui-improvementsFilipa Lacerda2017-02-27599-3773/+6228
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (196 commits) Add quotes to coverage pattern Update CHANGELOG.md Bump omniauth to 1.4.2 Bump Hashie to 3.5.5 to eliminate warning noise use single backticks for inline code Add performance query regression fix for !9088 affecting #27267 Fix spec API: Return 400 for all validation erros in the mebers API Adds confirmation for cancel button Add newline Corrected indentation on the template string Adds backoff algo from EE to CE We don't need these checks anymore Raise error when no content is provided Address review Update API v3 in line with v4 Fix new offenses Fix spec Fix specs Rename commit_file, commit_dir and remove_file and update specs ...
| * Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-278-9/+46
| |\ | | | | | | | | | | | | | | | | | | Add the username of the current user to the HTTP(S) clone URL Closes #1937 See merge request !9347
| | * Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-248-9/+46
| | |
| * | Merge branch 'patch-14' into 'master' Rémy Coutable2017-02-271-0/+6
| |\ \ | | | | | | | | | | | | | | | | Update manage_large_binaries_with_git_lfs.md See merge request !9412
| | * | use single backticks for inline codeheapifyman2017-02-251-1/+1
| | | |
| | * | Update manage_large_binaries_with_git_lfs.md heapifyman2017-02-211-0/+6
| | | | | | | | | | | | Add note to include .gitattributes file in repository - see instructions here: https://git-lfs.github.com/
| * | | Merge branch '27267-events-project-query-performance-regression' into 'master' Sean McGivern2017-02-272-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query performance regression fix affecting "Dashboard::ProjectsController#index.atom" Closes #27267 See merge request !9526
| | * | | Add performance query regression fix for !9088 affecting #2726727267-events-project-query-performance-regressionOswaldo Ferreira2017-02-242-1/+5
| | | | |
| * | | | Merge branch 'unified-member-api-response' into 'master' Sean McGivern2017-02-274-13/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API: Return 400 for all validation erros in the mebers API See merge request !9523
| | * | | | API: Return 400 for all validation erros in the mebers APIunified-member-api-responseRobert Schilling2017-02-244-13/+11
| | | | | |
| * | | | | Merge branch 'feature/runners-v4-api' into 'master' Kamil Trzciński2017-02-276-0/+232
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Runner registration/deletion API See merge request !9246
| | * | | | | Rename API::Ci to API::Runnerfeature/runners-v4-apiTomasz Maczukin2017-02-164-7/+7
| | | | | | |
| | * | | | | Fix rubocop offensesTomasz Maczukin2017-02-162-12/+11
| | | | | | |
| | * | | | | Add changelog entryTomasz Maczukin2017-02-161-0/+4
| | | | | | |
| | * | | | | Add Runner registration/deletion APITomasz Maczukin2017-02-165-0/+229
| | | | | | |
| * | | | | | Merge branch 'sh-bump-hashie-to-3.5.5' into 'master' Rémy Coutable2017-02-273-4/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Hashie to 3.5.5 and omniauth to 1.4.2 to eliminate warning noise Closes #28595 See merge request !9534
| | * | | | | | Update CHANGELOG.mdsh-bump-hashie-to-3.5.5Stan Hu2017-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | Bump omniauth to 1.4.2Stan Hu2017-02-252-3/+3
| | | | | | | |
| | * | | | | | Bump Hashie to 3.5.5 to eliminate warning noiseStan Hu2017-02-252-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28595
| * | | | | | | Merge branch 'add-quotes-to-coverage-pattern' into 'master' improve-backoff-algoGrzegorz Bizon2017-02-271-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add quotes to coverage pattern See merge request !9545
| | * | | | | | | Add quotes to coverage patternMax Raab2017-02-271-1/+1
| |/ / / / / / /
| * | | | | | | Merge branch 'backoff-algo-backport-ee' into 'master' Jacob Schatz2017-02-261-0/+52
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds backoff algo from EE to CE See merge request !9517
| | * | | | | | | Adds backoff algo from EE to CEbackoff-algo-backport-eeFilipa Lacerda2017-02-241-0/+52
| | | | | | | | |
| * | | | | | | | Merge branch 'update-vue-2.1' into 'master' Fatih Acet2017-02-264-5/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Vue to v2.1 See merge request !9386
| | * | | | | | | | add CHANGELOG.md entry for !9386update-vue-2.1Mike Greiling2017-02-201-0/+4
| | | | | | | | | |
| | * | | | | | | | use CommonJS vue distributionMike Greiling2017-02-201-1/+1
| | | | | | | | | |
| | * | | | | | | | upgrade Vue from v2.0.3 to v2.1.10Mike Greiling2017-02-202-7/+7
| | | | | | | | | |
| * | | | | | | | | Merge branch 'pedro-mattermost-slack-notifications-text' into 'master' Kamil Trzciński2017-02-266-23/+26
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clearer placeholders and channel definition for Mattermost and Slack notifications services See merge request !9139
| | * | | | | | | | Merge branch 'pedro-mattermost-slack-notifications-text' of ↵pedro-mattermost-slack-notifications-textPedro Moreira da Silva2017-02-240-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into pedro-mattermost-slack-notifications-text
| | | * | | | | | | | Update docs on Mattermost and Slack notifications channelsPedro Moreira da Silva2017-02-104-9/+12
| | | | | | | | | | |
| | | * | | | | | | | Add clearer placeholders and channel definition.Pedro Moreira da Silva2017-02-102-14/+14
| | | | | | | | | | |
| | * | | | | | | | | Update docs on Mattermost and Slack notifications channelsPedro Moreira da Silva2017-02-244-9/+12
| | | | | | | | | | |
| | * | | | | | | | | Add clearer placeholders and channel definition.Pedro Moreira da Silva2017-02-242-14/+14
| | | | | | | | | | |
| * | | | | | | | | | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-254-51/+123
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Git history follow renames again by performing the --skip in Ruby Closes #23062 See merge request !9314
| | * | | | | | | | | | Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skipRémy Coutable2017-02-232-84/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | | | | | Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-234-23/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hack is needed because of an issue when --follow and --skip are passed to git log at the same time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23062 Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Merge branch 'patch-14' into 'master' Allison Whilden2017-02-251-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update users.md See merge request !9475
| | * | | | | | | | | | | Update users.mdSarah O'Donnell2017-02-231-17/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-2428-787/+497
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistently create, update, and delete files, taking CRLF settings into account See merge request !9207
| | * | | | | | | | | | | | Fix specdm-fix-web-edit-new-linesDouwe Maan2017-02-244-82/+26
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add newlineDouwe Maan2017-02-241-0/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | We don't need these checks anymoreDouwe Maan2017-02-241-19/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Raise error when no content is providedDouwe Maan2017-02-244-9/+23
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Address reviewDouwe Maan2017-02-245-25/+41
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Update API v3 in line with v4Douwe Maan2017-02-241-7/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix new offensesDouwe Maan2017-02-241-3/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix specDouwe Maan2017-02-241-2/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix specsDouwe Maan2017-02-242-3/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-2416-102/+86
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-2412-596/+376
| | | | | | | | | | | | | |
View Lorry Controller Status