Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master' | Douwe Maan | 2017-06-05 | 1 | -8/+1 |
|\ | |||||
| * | backports changed import logic from pull mirroring feature into CE | Tiago Botelho | 2017-06-05 | 1 | -8/+1 |
* | | Merge branch 'mk-fix-git-over-http-rejections' into 'master' | Douwe Maan | 2017-06-05 | 3 | -78/+25 |
|\ \ | |||||
| * | | Refactor to let GitAccess errors bubble up | Michael Kozono | 2017-06-05 | 1 | -35/+14 |
| * | | Refactor to let `GitAccess` check protocol config | Michael Kozono | 2017-06-05 | 1 | -10/+0 |
| * | | Move CI access logic into GitAccess | Michael Kozono | 2017-06-05 | 3 | -25/+15 |
| * | | Refactor | Michael Kozono | 2017-06-05 | 1 | -4/+0 |
| * | | Check disabled commands in GitAccess instead | Michael Kozono | 2017-06-05 | 1 | -4/+0 |
| * | | Render GitAccess message if authorized | Michael Kozono | 2017-06-05 | 1 | -5/+1 |
* | | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master' | Douwe Maan | 2017-06-05 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Support hard deletion in Admin::UsersController#destroy | Nick Thomas | 2017-06-05 | 1 | -1/+1 |
| * | | | Refactor the DeleteUserWorker | Nick Thomas | 2017-06-05 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master' | Tim Zallmann | 2017-06-05 | 3 | -3/+9 |
|\ \ \ | |/ / |/| | | |||||
| * | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactorings | James Edwards-Jones | 2017-05-31 | 3 | -3/+9 |
* | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master' | Phil Hughes | 2017-06-05 | 1 | -3/+10 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-fo... | Luke "Jared" Bennett | 2017-06-02 | 16 | -148/+244 |
| |\ \ \ | |||||
| * | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. | Luke "Jared" Bennett | 2017-05-31 | 1 | -3/+10 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'zj-job-view-goes-real-time' into 'master' | Kamil Trzciński | 2017-06-05 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time | Kamil Trzcinski | 2017-06-02 | 9 | -23/+37 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time | Z.J. van de Weg | 2017-06-01 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Rename build to job | Z.J. van de Weg | 2017-06-01 | 1 | -1/+1 |
| * | | | | | | Initial implementation for real time job view | Z.J. van de Weg | 2017-05-31 | 1 | -0/+11 |
* | | | | | | | Merge branch '30469-convdev-index' into 'master' | Sean McGivern | 2017-06-05 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add Conversational Development Index page to admin panel | Taurie Davis, Simon Knox and Adam Niedzielski | 2017-06-01 | 1 | -0/+5 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master' | Douwe Maan | 2017-06-02 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-login | Maxime Besson | 2017-06-02 | 1 | -1/+5 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jouve/gitlab-ce-admin_keys' into 'master' | Rémy Coutable | 2017-06-02 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | redirect to keys index instead of user index after a key is deletedjouve/gitlab-ce-admin_keys | Cyril Jouve | 2017-06-01 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch '31511-jira-settings' into 'master' | Sean McGivern | 2017-06-02 | 1 | -14/+25 |
|\ \ \ \ \ | |||||
| * | | | | | Address review comments31511-jira-settings | Jarka Kadlecova | 2017-06-02 | 1 | -2/+2 |
| * | | | | | Add feature tests for improved JIRA settings | Jarka Kadlecova | 2017-06-01 | 1 | -7/+12 |
| * | | | | | simplify test&save actions when setting a service integration | Jarka Kadlecova | 2017-06-01 | 1 | -13/+19 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'zj-realtime-env-list' into 'master' | Kamil Trzciński | 2017-06-01 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-06-01 | 22 | -184/+326 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-05-25 | 4 | -8/+35 |
| |\ \ \ \ \ | |||||
| * | | | | | | Test etag caching router and incorporate review | Z.J. van de Weg | 2017-05-24 | 1 | -1/+1 |
| * | | | | | | Use etag caching for environments JSON | Z.J. van de Weg | 2017-05-22 | 1 | -0/+2 |
* | | | | | | | Merge branch '24196-protected-variables' into 'master' | Kamil Trzciński | 2017-06-01 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' into '24196-protected-variables' | Kamil Trzciński | 2017-06-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-06-01 | 8 | -126/+208 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-05-31 | 2 | -1/+3 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into '24196-protected-variables' | Lin Jen-Shin (godfat) | 2017-05-26 | 14 | -62/+146 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Frontend implementation, tests, and changelog | Lin Jen-Shin | 2017-05-25 | 1 | -1/+2 |
* | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master' | Sean McGivern | 2017-06-01 | 5 | -6/+6 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 5 | -6/+6 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'master' into 'trigger-source' | Grzegorz Bizon | 2017-05-31 | 8 | -126/+208 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'rename-builds-controller' into 'master' | Kamil Trzciński | 2017-05-31 | 5 | -120/+196 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into rename-builds-controller | Lin Jen-Shin | 2017-05-31 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into rename-builds-controller | Lin Jen-Shin | 2017-05-31 | 4 | -6/+4 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controller | Lin Jen-Shin | 2017-05-26 | 21 | -73/+201 |
| | |\ \ \ \ \ \ \ |