Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove Namespace model default scope override and write additional test to Pr...refactor-namespace-default-scope-override | Tiago Botelho | 2017-06-29 | 1 | -0/+10 |
* | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master' | Douwe Maan | 2017-06-29 | 2 | -26/+0 |
|\ | |||||
| * | Removes redundant pending delete checks30708-stop-using-deleted-at-to-filter-namespaces | Tiago Botelho | 2017-06-28 | 1 | -17/+0 |
| * | Fix current feature related specs | Tiago Botelho | 2017-06-28 | 1 | -9/+0 |
* | | Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master' | Robert Speicher | 2017-06-28 | 1 | -0/+21 |
|\ \ | |||||
| * | | Drop default ORDER scope when calling a find method on a Sortable model | Douwe Maan | 2017-06-28 | 1 | -0/+21 |
* | | | Merge branch 'shell-test-rebuild' into 'master' | Robert Speicher | 2017-06-28 | 1 | -8/+11 |
|\ \ \ | |||||
| * | | | Reinstall shell on the test env if it's outdatedshell-test-rebuild | Alejandro Rodríguez | 2017-06-19 | 1 | -8/+11 |
* | | | | Merge branch 'gitaly-encodings' into 'master' | Robert Speicher | 2017-06-28 | 1 | -0/+24 |
|\ \ \ \ | |||||
| * | | | | Fix gitaly ref encoding bugs | Jacob Vosmaer | 2017-06-28 | 1 | -0/+24 |
* | | | | | Merge branch 'winh-no-current-user-search-bar' into 'master' | Clement Ho | 2017-06-28 | 2 | -0/+69 |
|\ \ \ \ \ | |||||
| * | | | | | Introduce addClassIfElementExists utilitywinh-no-current-user-search-bar | winh | 2017-06-27 | 1 | -0/+35 |
| * | | | | | Add failing test for #34141 | winh | 2017-06-27 | 1 | -0/+34 |
* | | | | | | Merge branch 'port-changes-ee-2467' into 'master' | Douwe Maan | 2017-06-28 | 2 | -0/+49 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add ProjectWiki#ensure_repositoryport-changes-ee-2467 | Douglas Barbosa Alexandre | 2017-06-28 | 1 | -0/+18 |
| * | | | | | | Add Project#ensure_repository | Douglas Barbosa Alexandre | 2017-06-28 | 1 | -0/+31 |
* | | | | | | | Merge branch 'cherry-pick-5ea675be' into 'master' | Tim Zallmann | 2017-06-28 | 13 | -1246/+4891 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix environment_metrics speccherry-pick-5ea675be | Jose Ivan Vargas | 2017-06-26 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-re... | Phil Hughes | 2017-06-26 | 12 | -1245/+4890 |
* | | | | | | | | Merge branch 'dm-dependency-linker-newlines' into 'master' | Robert Speicher | 2017-06-28 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix diff of requirements.txt file by not matching newlines as part of package...dm-dependency-linker-newlines | Douwe Maan | 2017-06-27 | 1 | -0/+4 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bvl-fix-ldap-login' into 'master' | Douwe Maan | 2017-06-28 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-login | Bob Van Landuyt | 2017-06-28 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'rc/a-better-stub-env' into 'master' | Grzegorz Bizon | 2017-06-28 | 1 | -9/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use a slightly cleaner approach to stub ENVrc/a-better-stub-env | Rémy Coutable | 2017-06-28 | 1 | -9/+27 |
* | | | | | | | | | Merge branch 'stop-notification-recipient-service-modifying-participants' int... | Grzegorz Bizon | 2017-06-28 | 1 | -0/+34 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Ensure NotificationRecipientService doesn't modify participants | Sean McGivern | 2017-06-28 | 1 | -0/+34 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'issue-boards-closed-list-all' into 'master' | Sean McGivern | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed issue boards closed list not listing all issues | Phil Hughes | 2017-06-28 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'fix-duplicate-shared-examples' into 'master' | Grzegorz Bizon | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Move share examples to their correct locationfix-duplicate-shared-examples | Rémy Coutable | 2017-06-27 | 1 | -1/+1 |
* | | | | | | | | | Vendor the gitlab-git-test repo | Jacob Vosmaer (GitLab) | 2017-06-28 | 12 | -2/+99 |
* | | | | | | | | | Merge branch 'submodules-private' into 'master' | Sean McGivern | 2017-06-28 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Make Gitlab::Ggit::Repository#submodules private | Jacob Vosmaer | 2017-06-27 | 1 | -4/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'refactor-emoji-utils' into 'master' | Tim Zallmann | 2017-06-28 | 2 | -5/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | move glEmojiTag method to emoji helper | Mike Greiling | 2017-06-27 | 1 | -1/+1 |
| * | | | | | | | | split emoji support methods from the async module | Mike Greiling | 2017-06-27 | 2 | -2/+2 |
| * | | | | | | | | update import locations for karma specs | Mike Greiling | 2017-06-23 | 2 | -4/+3 |
* | | | | | | | | | Merge branch 'fix-head-pipeline-for-commit-status' into 'master' | Grzegorz Bizon | 2017-06-27 | 1 | -6/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-status | Kamil Trzcinski | 2017-06-27 | 1 | -6/+21 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'backport-system-check-fix' into 'master' | Douwe Maan | 2017-06-27 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Disable rainbow during SimpleExecutor specs to have consistencebackport-system-check-fix | Gabriel Mazetto | 2017-06-27 | 1 | -2/+11 |
| * | | | | | | | | Make the SimpleExecutor rescue exceptions in the executing Checks | Gabriel Mazetto | 2017-06-27 | 1 | -2/+17 |
* | | | | | | | | | Merge branch 'bugfix/ruby2.4-compat' into 'master' | Douwe Maan | 2017-06-27 | 5 | -23/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rubocop fix: don't use single line blocksbugfix/ruby2.4-compat | http://jneen.net/ | 2017-06-26 | 1 | -2/+6 |
| * | | | | | | | | | rm use of deprecated webmock api in teamcity_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -2/+4 |
| * | | | | | | | | | rm use of deprecated webmock api in campfire_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -5/+6 |
| * | | | | | | | | | rm use of deprecated webmock api in jira model spec | http://jneen.net/ | 2017-06-26 | 1 | -11/+11 |
| * | | | | | | | | | rm use of deprecated webmock api in bamboo_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -2/+2 |
| * | | | | | | | | | remove use of deprecated webmock feature in jira specs | http://jneen.net/ | 2017-06-26 | 1 | -7/+7 |
| | |_|_|_|_|_|/ / | |/| | | | | | | |