Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '12910-snippets-description' into 'master' | Phil Hughes | 2017-06-07 | 1 | -0/+1 |
|\ | |||||
| * | Support descriptions for snippets | Jarka Kadlecova | 2017-05-31 | 1 | -0/+1 |
* | | Merge branch 'zj-read-registry-pat' into 'master' | Kamil Trzciński | 2017-06-07 | 1 | -11/+15 |
|\ \ | |||||
| * | | Fix test failureszj-read-registry-pat | Z.J. van de Weg | 2017-06-06 | 1 | -11/+8 |
| * | | Create read_registry scope with JWT auth | Z.J. van de Weg | 2017-06-05 | 1 | -0/+7 |
* | | | redesign caching of application settings | Paul Charlton | 2017-06-06 | 1 | -3/+4 |
* | | | Merge branch '29690-rotate-otp-key-base' into 'master' | Brian Neel | 2017-06-06 | 1 | -0/+70 |
|\ \ \ | |||||
| * | | | Add a Rake task to aid in rotating otp_key_base | Nick Thomas | 2017-06-05 | 1 | -0/+70 |
* | | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master' | Douwe Maan | 2017-06-05 | 4 | -91/+278 |
|\ \ \ \ | |||||
| * | | | | Refactor to remove a special case | Michael Kozono | 2017-06-05 | 1 | -0/+15 |
| * | | | | Clarify error messages | Michael Kozono | 2017-06-05 | 1 | -2/+2 |
| * | | | | Refactor to let GitAccess errors bubble up | Michael Kozono | 2017-06-05 | 3 | -123/+128 |
| * | | | | Move CI access logic into GitAccess | Michael Kozono | 2017-06-05 | 1 | -1/+127 |
| * | | | | Refactor | Michael Kozono | 2017-06-05 | 1 | -6/+6 |
| * | | | | Check disabled commands in GitAccess instead | Michael Kozono | 2017-06-05 | 1 | -1/+42 |
| |/ / / | |||||
* | | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master' | Tim Zallmann | 2017-06-05 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactorings | James Edwards-Jones | 2017-05-31 | 1 | -0/+2 |
* | | | | | Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-t... | Douwe Maan | 2017-06-05 | 2 | -5/+36 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Increase diff limits to 100 KB for collapse and 200 KB overall31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening | Sean McGivern | 2017-06-02 | 2 | -5/+36 |
* | | | | | 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 | 6 | -29/+49 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time | Z.J. van de Weg | 2017-06-01 | 3 | -1/+95 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Initial implementation for real time job view | Z.J. van de Weg | 2017-05-31 | 1 | -0/+11 |
* | | | | | | | | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master' | Robert Speicher | 2017-06-02 | 3 | -5/+94 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpc | Ahmad Sherif | 2017-06-02 | 3 | -5/+94 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper` | Bob Van Landuyt | 2017-06-01 | 2 | -3/+3 |
* | | | | | | | Merge branch 'zj-realtime-env-list' into 'master' | Kamil Trzciński | 2017-06-01 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-06-01 | 40 | -485/+1713 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-05-25 | 8 | -107/+663 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Test etag caching router and incorporate review | Z.J. van de Weg | 2017-05-24 | 1 | -1/+2 |
| * | | | | | | | | Use etag caching for environments JSON | Z.J. van de Weg | 2017-05-22 | 1 | -0/+10 |
* | | | | | | | | | Merge branch '24196-protected-variables' into 'master' | Kamil Trzciński | 2017-06-01 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into '24196-protected-variables' | Kamil Trzciński | 2017-06-01 | 3 | -1/+95 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-06-01 | 6 | -8/+25 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-05-31 | 9 | -16/+228 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into '24196-protected-variables' | Lin Jen-Shin (godfat) | 2017-05-26 | 22 | -460/+1365 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix tests and rubocop offense | Lin Jen-Shin | 2017-05-25 | 1 | -1/+5 |
| * | | | | | | | | | | Frontend implementation, tests, and changelog | Lin Jen-Shin | 2017-05-25 | 1 | -0/+5 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master' | Sean McGivern | 2017-06-01 | 2 | -25/+25 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Change no_limits to limitsdm-collapsed-blob | Douwe Maan | 2017-05-31 | 1 | -9/+9 |
| * | | | | | | | | | Fix Diff#too_large? and specs | Douwe Maan | 2017-05-30 | 1 | -7/+7 |
| * | | | | | | | | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 2 | -19/+19 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into 'trigger-source' | Grzegorz Bizon | 2017-05-31 | 7 | -8/+118 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add feature toggles through Flipper | Alejandro Rodríguez | 2017-05-31 | 1 | -1/+81 |
| * | | | | | | | | | Merge branch 'dm-gitmodules-parsing' into 'master' | Grzegorz Bizon | 2017-05-31 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Make .gitmodules parsing more resilient to syntax errors | Douwe Maan | 2017-05-30 | 1 | -0/+13 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controller | Lin Jen-Shin | 2017-05-31 | 5 | -7/+24 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'fix/gb/use-merge-ability-for-protected-manual-actions' into 'ma... | Kamil Trzciński | 2017-05-31 | 4 | -6/+23 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | | * | | | | | | | Fix chat commands specs related to protected actions | Grzegorz Bizon | 2017-05-31 | 1 | -2/+5 |
| | | * | | | | | | | Fix build factory specs related to protected actions | Grzegorz Bizon | 2017-05-31 | 1 | -1/+4 |