summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Readded missing statement from the rebaseJose Ivan Vargas2017-04-031-0/+1
| | | | | | | | | |
| * | | | | | | | | Added the following ux improvements:Jose Ivan Vargas2017-04-035-30/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add text for the buttons on environment detail page * Reduced the size of the charts * Environment name is now a link Also some general code cleanup
* | | | | | | | | | Merge branch 'remove-unused-icons' into 'master' Filipa Lacerda2017-04-0417-133/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete unused icons; add empty lines to svg files See merge request !10415
| * | | | | | | | | | Delete unused icons; add empty lines to svg filesremove-unused-iconsAnnabel Dunstone Gray2017-04-0317-133/+7
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/disable-gitaly-post-receive-pack' into 'master' Robert Speicher2017-04-042-19/+22
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable support for Gitaly PostReceivePack See merge request !10444
| * | | | | | | | | Disable support for Gitaly PostReceivePackfix/disable-gitaly-post-receive-packAhmad Sherif2017-04-042-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitaly/issues/172
* | | | | | | | | | Merge branch 'feature/bump-gitaly-server-version' into 'master'Robert Speicher2017-04-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Gitaly server version to 0.5.0 See merge request !10446
| * | | | | | | | | | Bump Gitaly server version to 0.5.0feature/bump-gitaly-server-versionAhmad Sherif2017-04-041-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-04-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list recommended version of PostgreSQL See merge request !10190
| * | | | | | | | | | | list recommended version of PostgreSQLBen Bodenmiller2017-04-041-0/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into ↵Douwe Maan2017-04-042-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Adds git terminal prompt env var to application rb Closes #24187 See merge request !10372
| * | | | | | | | | | | adds git terminal prompt env var to application rb24187-set-git-terminal-prompt-env-var-in-initializerTiago Botelho2017-04-032-0/+5
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '29492-useless-queries' into 'master'Sean McGivern2017-04-046-0/+64
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove useless queries with false conditions (e.g 1=0) Closes #29492 See merge request !10141
| * | | | | | | | | | | Remove useless queries with false conditions (e.g 1=0)mhasbini2017-04-046-0/+64
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'zj-kube-service-auto-fill' into 'master' Kamil Trzciński2017-04-044-48/+90
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't autofill kubernetes namespace See merge request !10438
| * | | | | | | | | | | | Don't autofill kubernetes namespaceZ.J. van de Weg2017-04-044-48/+90
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'backport-es-global-search-difference' into 'master' Sean McGivern2017-04-041-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport differences in global search from EE to CE See merge request !10445
| * | | | | | | | | | | | | Backport differences in global search from EE to CENick Thomas2017-04-041-1/+5
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '29670-jira-integration-documentation-improvment' into 'master' Achilleas Pipinellis2017-04-043-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves Jira integration documentation Closes #29670 See merge request !10067
| * | | | | | | | | | | | | Improves Jira integration documentationMatthew Bender2017-03-173-0/+9
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'sh-add-polling-images' into 'master' Achilleas Pipinellis2017-04-043-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add long polling diagrams See merge request !10270
| * | | | | | | | | | | | | | Add long polling diagramssh-add-polling-imagesStan Hu2017-03-313-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch 'master' into 'master' Achilleas Pipinellis2017-04-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update patch_versions.md, add `yarn:install` in `Clean up assets and cache` command. See merge request !10442
| * | | | | | | | | | | | | | Update patch_versions.md, add `yarn:install` in `Clean up assets and cache` ↵xyb2017-04-041-1/+1
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command.
* | | | | | | | | | | | | | Merge branch 'remove_index_for_users.current_sign_in_at' into 'master' Yorick Peterse2017-04-043-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove index for users.current sign in at Closes #29523 See merge request !10401
| * | | | | | | | | | | | | | Remove index for users.current sign in atblackst0ne2017-04-043-2/+30
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '24784-system-notes-icons' into 'master' Sean McGivern2017-04-043-17/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split status and confidentiality action See merge request !10443
| * | | | | | | | | | | | | Split status and confidentiality actionJarka Kadlecova2017-04-043-17/+36
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'backport-sticking-api-helper-changes' into 'master' Kamil Trzciński2017-04-045-22/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport API changes needed to fix sticking in EE See merge request !10376
| * | | | | | | | | | | | | Backport API changes needed to fix sticking in EEbackport-sticking-api-helper-changesYorick Peterse2017-03-315-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes are ported over from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1502 to reduce the number of merge conflicts that may occur.
* | | | | | | | | | | | | | Merge branch 'rc/fix-transient-failures-following-no-ffaker' into 'master' Sean McGivern2017-04-042-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we generate unique usernames otherwise validations fail See merge request !10436
| * | | | | | | | | | | | | Ensure we generate unique usernames otherwise validations failrc/fix-transient-failures-following-no-ffakerRémy Coutable2017-04-042-3/+3
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'rc/fix-spinach-plus-knapsack-properly' into 'master' Robert Speicher2017-04-042-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a Knapsack issue that would load support/capybara.rb before support/env.rb See merge request !10430
| * | | | | | | | | | | | Fix a Knapsack issue that would load support/capybara.rb before support/env.rbrc/fix-spinach-plus-knapsack-properlyRémy Coutable2017-04-042-7/+0
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once https://github.com/ArturT/knapsack/issues/57 is solved and released in a new gem version, we can remove the KNAPSACK_TEST_DIR in .gitlab-ci.yml. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch '29643-stop-using-ffaker-in-factories' into 'master' Robert Speicher2017-04-0444-163/+119
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use FFaker in factories, use sequences instead Closes #29643 See merge request !10184
| * | | | | | | | | | | | Ensure user has a unique username otherwise `user10` would match `user1`29643-stop-using-ffaker-in-factoriesRémy Coutable2017-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Ensure the AbuseReport fixtures create unique reported usersRémy Coutable2017-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Don't use FFaker in factories, use sequences insteadRémy Coutable2017-04-035-28/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Fix brittle specsRémy Coutable2017-04-038-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Fix the AbuseReport seederRémy Coutable2017-04-031-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Don't use FFaker in factories, use sequences insteadRémy Coutable2017-04-0337-142/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FFaker can generate data that randomly break our test suite. This simplifies our factories and use sequences which are more predictive. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch '29241-fix-transient-failure' into 'master' Robert Speicher2017-04-041-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure users have a short username otherwise a click event is triggered outside the search field Closes #29241 See merge request !10411
| * | | | | | | | | | | | | Ensure users have a short username otherwise a click event is triggered ↵29241-fix-transient-failureRémy Coutable2017-04-041-11/+11
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outside the search field Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'quiet-pipelines' into 'master' Rémy Coutable2017-04-0411-172/+237
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quiet pipeline emails Closes #24845 See merge request !10333
| * | | | | | | | | | | | | Quiet pipeline emailsquiet-pipelinesSean McGivern2017-04-0311-172/+237
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Never send a pipeline email to anyone other than the user who created the pipeline. 2. Only send pipeline success emails to people with the custom notification setting for enabled. Watchers and participants will never receive this. 3. When custom settings are unset (for new settings and legacy ones), act as if failed_pipeline is set.
* | | | | | | | | | | | | Merge branch 'rs-bullet-raise' into 'master' Stan Hu2017-04-032-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the `bullet_logger` setting; enable `raise` in test environment Closes #30129 See merge request !10263
| * | | | | | | | | | | | | Enable the `bullet_logger` setting; enable `raise` in test environmentrs-bullet-raiseRobert Speicher2017-04-032-5/+10
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'pages-debug-log' into 'master' Rémy Coutable2017-04-033-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log errors in UpdatePagesService See merge request !10335
| * | | | | | | | | | | | | Log errors in UpdatePagesServiceDanilo Bargen2017-03-313-0/+9
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix-github-importer-slowness' into 'master' Robert Speicher2017-04-0315-58/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of GitHub importer Closes #28183 See merge request !10273