Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bvl-rename-all-reserved-paths' into 'master' | Sean McGivern | 2017-06-29 | 5 | -17/+241 |
|\ | |||||
| * | Adjust for new static-analysis failuresbvl-rename-all-reserved-paths-mysql | Bob Van Landuyt | 2017-06-27 | 1 | -6/+6 |
| * | Keep failed renames in redis | Bob Van Landuyt | 2017-06-26 | 1 | -0/+19 |
| * | Use the migration name as a key in redis | Bob Van Landuyt | 2017-06-26 | 2 | -1/+5 |
| * | Don't break rolling back when a namespace or project was renamed | Bob Van Landuyt | 2017-06-26 | 2 | -0/+14 |
| * | Revert renames from a migration | Bob Van Landuyt | 2017-06-26 | 1 | -0/+22 |
| * | Revert namespace renames | Bob Van Landuyt | 2017-06-26 | 3 | -16/+65 |
| * | Add methods to revert project renames | Bob Van Landuyt | 2017-06-26 | 2 | -16/+97 |
| * | Track all renames in redis | Bob Van Landuyt | 2017-06-26 | 4 | -0/+35 |
* | | Merge branch 'fix-34417' into 'master' | Sean McGivern | 2017-06-29 | 1 | -0/+34 |
|\ \ | |||||
| * | | Add tests for project import state transition: [:started] => [:finished]fix-34417 | Douglas Barbosa Alexandre | 2017-06-28 | 1 | -0/+34 |
* | | | Merge branch 'postreceive-gl-repository' into 'master' | Sean McGivern | 2017-06-29 | 1 | -25/+13 |
|\ \ \ | |||||
| * | | | Use gl_repository exclusively as identifier on post-receivepostreceive-gl-repository | Alejandro Rodríguez | 2017-06-27 | 1 | -25/+13 |
* | | | | Merge branch 'feature/sm/34314-add-hasvariable-concern' into 'master' | Kamil Trzciński | 2017-06-29 | 2 | -39/+44 |
|\ \ \ \ | |||||
| * | | | | Improve small thingsfeature/sm/34314-add-hasvariable-concern | Shinya Maeda | 2017-06-28 | 2 | -4/+2 |
| * | | | | Remove PoC spec | Shinya Maeda | 2017-06-28 | 1 | -34/+0 |
| * | | | | Add a test for checking validates :key does not override by concern | Shinya Maeda | 2017-06-28 | 1 | -0/+34 |
| * | | | | Decuplin | Shinya Maeda | 2017-06-28 | 2 | -39/+46 |
* | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | |