summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Remove Namespace model default scope override and write additional test to Pr...refactor-namespace-default-scope-overrideTiago Botelho2017-06-291-0/+10
* Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-292-26/+0
|\
| * Removes redundant pending delete checks30708-stop-using-deleted-at-to-filter-namespacesTiago Botelho2017-06-281-17/+0
| * Fix current feature related specsTiago Botelho2017-06-281-9/+0
* | Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'Robert Speicher2017-06-281-0/+21
|\ \
| * | Drop default ORDER scope when calling a find method on a Sortable modelDouwe Maan2017-06-281-0/+21
* | | Merge branch 'shell-test-rebuild' into 'master'Robert Speicher2017-06-281-8/+11
|\ \ \
| * | | Reinstall shell on the test env if it's outdatedshell-test-rebuildAlejandro Rodríguez2017-06-191-8/+11
* | | | Merge branch 'gitaly-encodings' into 'master'Robert Speicher2017-06-281-0/+24
|\ \ \ \
| * | | | Fix gitaly ref encoding bugsJacob Vosmaer2017-06-281-0/+24
* | | | | Merge branch 'winh-no-current-user-search-bar' into 'master'Clement Ho2017-06-282-0/+69
|\ \ \ \ \
| * | | | | Introduce addClassIfElementExists utilitywinh-no-current-user-search-barwinh2017-06-271-0/+35
| * | | | | Add failing test for #34141winh2017-06-271-0/+34
* | | | | | Merge branch 'port-changes-ee-2467' into 'master'Douwe Maan2017-06-282-0/+49
|\ \ \ \ \ \
| * | | | | | Add ProjectWiki#ensure_repositoryport-changes-ee-2467Douglas Barbosa Alexandre2017-06-281-0/+18
| * | | | | | Add Project#ensure_repositoryDouglas Barbosa Alexandre2017-06-281-0/+31
* | | | | | | Merge branch 'cherry-pick-5ea675be' into 'master'Tim Zallmann2017-06-2813-1246/+4891
|\ \ \ \ \ \ \
| * | | | | | | Fix environment_metrics speccherry-pick-5ea675beJose Ivan Vargas2017-06-261-1/+1
| * | | | | | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-re...Phil Hughes2017-06-2612-1245/+4890
* | | | | | | | Merge branch 'dm-dependency-linker-newlines' into 'master'Robert Speicher2017-06-281-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix diff of requirements.txt file by not matching newlines as part of package...dm-dependency-linker-newlinesDouwe Maan2017-06-271-0/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'bvl-fix-ldap-login' into 'master'Douwe Maan2017-06-281-0/+10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-loginBob Van Landuyt2017-06-281-0/+10
* | | | | | | | Merge branch 'rc/a-better-stub-env' into 'master'Grzegorz Bizon2017-06-281-9/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Use a slightly cleaner approach to stub ENVrc/a-better-stub-envRémy Coutable2017-06-281-9/+27
* | | | | | | | | Merge branch 'stop-notification-recipient-service-modifying-participants' int...Grzegorz Bizon2017-06-281-0/+34
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Ensure NotificationRecipientService doesn't modify participantsSean McGivern2017-06-281-0/+34
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'issue-boards-closed-list-all' into 'master'Sean McGivern2017-06-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue boards closed list not listing all issuesPhil Hughes2017-06-281-1/+1
* | | | | | | | | Merge branch 'fix-duplicate-shared-examples' into 'master'Grzegorz Bizon2017-06-281-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Move share examples to their correct locationfix-duplicate-shared-examplesRémy Coutable2017-06-271-1/+1
* | | | | | | | | Vendor the gitlab-git-test repoJacob Vosmaer (GitLab)2017-06-2812-2/+99
* | | | | | | | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-281-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-271-4/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'refactor-emoji-utils' into 'master'Tim Zallmann2017-06-282-5/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | move glEmojiTag method to emoji helperMike Greiling2017-06-271-1/+1
| * | | | | | | | split emoji support methods from the async moduleMike Greiling2017-06-272-2/+2
| * | | | | | | | update import locations for karma specsMike Greiling2017-06-232-4/+3
* | | | | | | | | Merge branch 'fix-head-pipeline-for-commit-status' into 'master'Grzegorz Bizon2017-06-271-6/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-statusKamil Trzcinski2017-06-271-6/+21
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'backport-system-check-fix' into 'master'Douwe Maan2017-06-271-0/+24
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Disable rainbow during SimpleExecutor specs to have consistencebackport-system-check-fixGabriel Mazetto2017-06-271-2/+11
| * | | | | | | | Make the SimpleExecutor rescue exceptions in the executing ChecksGabriel Mazetto2017-06-271-2/+17
* | | | | | | | | Merge branch 'bugfix/ruby2.4-compat' into 'master'Douwe Maan2017-06-275-23/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rubocop fix: don't use single line blocksbugfix/ruby2.4-compathttp://jneen.net/2017-06-261-2/+6
| * | | | | | | | | rm use of deprecated webmock api in teamcity_service_spechttp://jneen.net/2017-06-261-2/+4
| * | | | | | | | | rm use of deprecated webmock api in campfire_service_spechttp://jneen.net/2017-06-261-5/+6
| * | | | | | | | | rm use of deprecated webmock api in jira model spechttp://jneen.net/2017-06-261-11/+11
| * | | | | | | | | rm use of deprecated webmock api in bamboo_service_spechttp://jneen.net/2017-06-261-2/+2
| * | | | | | | | | remove use of deprecated webmock feature in jira specshttp://jneen.net/2017-06-261-7/+7
| | |_|_|_|_|_|/ / | |/| | | | | | |