Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-add-audit-logging-json-ce' into 'master' | Stan Hu | 2018-10-18 | 1 | -4/+22 |
|\ | |||||
| * | Add support for JSON logging for audit events | Stan Hu | 2018-10-18 | 1 | -4/+22 |
* | | Merge branch 'winh-prettier-job-app' into 'master' | Clement Ho | 2018-10-18 | 1 | -145/+145 |
|\ \ | |/ |/| | |||||
| * | Make app/assets/javascripts/jobs/components/job_app.vue prettier | Winnie Hellmann | 2018-10-18 | 1 | -145/+145 |
* | | Merge branch 'sh-associate-rakefile-ruby' into 'master' | Clement Ho | 2018-10-18 | 1 | -0/+1 |
|\ \ | |||||
| * | | Associate Rakefile with Ruby icon in diffs | Stan Hu | 2018-10-13 | 1 | -3/+2 |
* | | | Merge branch '52855-use-monotonic-time-in-webhooks' into 'master' | Stan Hu | 2018-10-18 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | Use monotonic time in computing web hook execution time | Heinrich Lee Yu | 2018-10-18 | 1 | -3/+3 |
* | | | | Resolve "Re-arrange help-related user menu items into new Help menu" | Dennis Tang | 2018-10-18 | 5 | -11/+14 |
* | | | | Show wiki empty state layout on wiki-only project overview page | Jacques Erasmus | 2018-10-18 | 1 | -8/+8 |
* | | | | Merge branch 'qa-nightly-26' into 'master' | Rémy Coutable | 2018-10-18 | 3 | -5/+5 |
|\ \ \ \ | |||||
| * | | | | [QA] Fix the 'clone using deploy key' tests | Rémy Coutable | 2018-10-18 | 3 | -5/+5 |
* | | | | | Merge branch 'ml-qa-code-owners' into 'master' | Rémy Coutable | 2018-10-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Add support for pushing and viewing files | Mark Lapierre | 2018-10-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'change-generating-url-functions' into 'master' | Rémy Coutable | 2018-10-18 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | change generating url functions for external url | benjamin | 2018-10-16 | 2 | -2/+2 |
* | | | | | | | Merge branch 'sh-backport-update-service-fix' into 'master' | Sean McGivern | 2018-10-18 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix Groups::UpdateService#execute not returning correct error code | Stan Hu | 2018-10-18 | 1 | -2/+4 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Make getting a user by the username case insensitive | William George | 2018-10-18 | 7 | -24/+48 |
|/ / / / / / | |||||
* | | | | | | Merge branch '51386-broken-border-reports' into 'master' | Phil Hughes | 2018-10-18 | 2 | -6/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixes broken borders in reports section MR widget | Filipa Lacerda | 2018-10-17 | 2 | -6/+7 |
* | | | | | | | Merge branch 'sh-strip-github-pat-whitespace' into 'master' | Rémy Coutable | 2018-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Strip whitespace around GitHub personal access tokens | Stan Hu | 2018-10-17 | 1 | -1/+1 |
* | | | | | | | Merge branch '7493-configuring-prometheus-alerts-causes-cluster-install-page-... | Mike Greiling | 2018-10-17 | 2 | -142/+152 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add missing state on the application row component | Jose Vargas | 2018-10-17 | 2 | -142/+152 |
* | | | | | | | | Merge branch 'ee-7944-fix-resolve-checkbox-text-color' into 'master' | Clement Ho | 2018-10-17 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Backport from EE: set color on note-form-actions | André Luís | 2018-10-17 | 1 | -0/+2 |
* | | | | | | | | | Merge branch '52527-harden-wiki-against-missing-last-version' into 'master' | Douglas Barbosa Alexandre | 2018-10-17 | 3 | -4/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Harden the wiki against missing last_versions | Nick Thomas | 2018-10-17 | 3 | -4/+8 |
* | | | | | | | | | | Merge branch 'gt-remove-prometheus-configuration-help-text' into 'master' | Clement Ho | 2018-10-17 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove prometheus configuration help text | George Tsiolis | 2018-10-17 | 1 | -1/+0 |
* | | | | | | | | | | | Merge branch '49591-use-cached-readme-blobs' into 'master' | Rémy Coutable | 2018-10-17 | 2 | -27/+43 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use cached readme blobs where appropriate | Nick Thomas | 2018-10-17 | 2 | -27/+43 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Fixed bug with the content disposition with wiki attachments | Francisco Javier López | 2018-10-17 | 6 | -15/+26 |
* | | | | | | | | | | | Merge branch '44361-remove-gitlab-grit' into 'master' | Rémy Coutable | 2018-10-17 | 1 | -48/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Merge flowdock monkeypatch into the inlined gem | Nick Thomas | 2018-10-16 | 1 | -48/+0 |
| * | | | | | | | | | | | Inline the gitlab-flowdock-git-hooks gem | Nick Thomas | 2018-10-16 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Extend Create New Merge Request test to also add a label | Aleksandr Soborov | 2018-10-17 | 5 | -9/+9 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'gt-update-environments-empty-state' into 'master' | Filipa Lacerda | 2018-10-17 | 1 | -14/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update environments empty state | George Tsiolis | 2018-10-17 | 1 | -14/+15 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Replace job with group in frontend components to be consistent with backend | Winnie Hellmann | 2018-10-17 | 5 | -59/+39 |
* | | | | | | | | | | Allow JIRA to login using email and API token | Felipe Artur | 2018-10-17 | 2 | -3/+6 |
| |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
* | | | | | | | | | Resolve "Integrate new vue+vuex code base with new API and remove old haml code" | Filipa Lacerda | 2018-10-17 | 20 | -667/+635 |
* | | | | | | | | | Resolve "In web editor, when delete a file, should navigate to enclosing dire... | George Thomas | 2018-10-17 | 1 | -4/+14 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'prettify-all-the-things-8' into 'master' | Fatih Acet | 2018-10-16 | 50 | -1051/+1330 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prettify additional modules (I through Z) | Mike Greiling | 2018-10-16 | 50 | -1051/+1330 |
* | | | | | | | | | Merge branch 'prettify-all-the-things-1' into 'master' | Fatih Acet | 2018-10-16 | 76 | -1029/+1138 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Prettify environments feature_highlight and filtered_search modules | Mike Greiling | 2018-10-16 | 22 | -405/+459 |
| * | | | | | | | | Prettify diff_notes diffs and droplab modules | Mike Greiling | 2018-10-16 | 18 | -136/+172 |
| * | | | | | | | | Prettify blob behaviors and cycle_analytics modules | Mike Greiling | 2018-10-16 | 36 | -488/+507 |
| |/ / / / / / / |