summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Add Changelog fix textual description in config.ruPawel Chojnacki2017-06-022-1/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Ensure prometheus_data_dir existsPawel Chojnacki2017-06-021-0/+0
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Bump prometheus client versionPawel Chojnacki2017-06-021-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use only ENV for metrics folder locationPawel Chojnacki2017-06-025-15/+12
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Bring back the tokenPawel Chojnacki2017-06-021-0/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | remove prometheus samplerPawel Chojnacki2017-06-021-51/+0
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Split metrics from health controller into metrics controllerPawel Chojnacki2017-06-027-90/+98
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add Prometheus metrics configurationPawel Chojnacki2017-06-023-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Cleanup Gemfile
| * | | | | | | | | | | | | | | | | | Prometheus settingsPawel Chojnacki2017-06-024-10/+13
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add trailing newline to response.Kevin Lyda2017-06-023-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prometheus requires a trailing newline in its response. + cleanup
| * | | | | | | | | | | | | | | | | | Prometheus metrics first passPawel Chojnacki2017-06-026-10/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metrics wip
| * | | | | | | | | | | | | | | | | | Use the gem for the ruby prometheus client.Kevin Lyda2017-06-021-9/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Initial pass at prometheus monitoring.Kevin Lyda2017-06-024-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a step for #29118. Add a single metric to count successful logins. Summary types are not supported so remove Collector. Either we need to support the summary type or we need to create a multiprocess-friendly Collector. Add config to load prometheus and set up the Collector and the Exporter. Fix `Gemfile` as current prometheus-client gemspec is missing the `mmap2` dependency.
| * | | | | | | | | | | | | | | | | | Add the prometheus gem.Kevin Lyda2017-06-021-0/+10
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch ↵Sean McGivern2017-06-075-28/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only' into 'master' Fix incorrect ETag cache key when relative instance URL is used Closes #32995 See merge request !11964
| * | | | | | | | | | | | | | | | | | | Fix incorrect ETag cache key when relative instance URL is usedAdam Niedzielski2017-06-075-28/+52
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-0737-41/+591
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| * | | | | | | | | | | | | | | | | | | | Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-0715-36/+164
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Support descriptions for snippetsJarka Kadlecova2017-05-3134-37/+459
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-read-registry-pat' into 'master'Kamil Trzciński2017-06-0711-36/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow pulling container images using personal access tokens Closes #19219 See merge request !11845
| * | | | | | | | | | | | | | | | | | | Fix test failureszj-read-registry-patZ.J. van de Weg2017-06-065-30/+38
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Create read_registry scope with JWT authZ.J. van de Weg2017-06-0510-33/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first commit doing mainly 3 things: 1. create a new scope and allow users to use it 2. Have the JWTController respond correctly on this 3. Updates documentation to suggest usage of PATs There is one gotcha, there will be no support for impersonation tokens, as this seems not needed. Fixes gitlab-org/gitlab-ce#19219
* | | | | | | | | | | | | | | | | | | | Merge branch '30378-simplified-repository-settings-page' into 'master'Phil Hughes2017-06-0711-23/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Simplified Repository Settings page" Closes #30378 See merge request !11698
| * | | | | | | | | | | | | | | | | | | | Resolve "Simplified Repository Settings page"Mike Greiling2017-06-0711-23/+159
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-06-0747-52/+208
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-status' into 'master' Resolve "Add a rubocop that forbids `redirect_to` inside a controller `destroy` action without an explicit `status`" Closes #31840 See merge request !11749
| * | | | | | | | | | | | | | | | | | | | Add a rubocop rule to check if a method 'redirect_to' is used without ↵31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-statusblackst0ne2017-06-0747-52/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explicitly set 'status' in 'destroy' actions of controllers
* | | | | | | | | | | | | | | | | | | | | Merge branch '31633-animate-issue' into 'master'Phil Hughes2017-06-077-26/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animate adding issue to boards Closes #31633 See merge request !11785
| * | | | | | | | | | | | | | | | | | | | | animate adding issue to boards31633-animate-issueSimon Knox2017-06-017-26/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix some false positive tests for board_new_issue
* | | | | | | | | | | | | | | | | | | | | | Merge branch '2563-backport-ee1942' into 'master'Grzegorz Bizon2017-06-077-18/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport some EE changes from adding shared_runners_minutes_limit to the API Closes gitlab-ee#2563 See merge request !11936
| * | | | | | | | | | | | | | | | | | | | | Just let the user to create the namespace2563-backport-ee1942Lin Jen-Shin2017-06-062-6/+6
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942Lin Jen-Shin2017-06-065-12/+15
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch '33380-button-icon' into 'master'Robert Speicher2017-06-072-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove icon from reset health check token button Closes #33380 See merge request !11956
| * | | | | | | | | | | | | | | | | | | | | | Remove icon from reset health check token button33380-button-iconAnnabel Dunstone Gray2017-06-062-10/+7
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da-fix-db-seed' into 'master'Douwe Maan2017-06-071-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error while seeding projects in database See merge request !11953
| * | | | | | | | | | | | | | | | | | | | | | Fix error while seeding projects in databaseda-fix-db-seedDouglas Barbosa Alexandre2017-06-061-1/+3
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'environment-detail-view' into 'master'Clement Ho2017-06-067-22/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment detail view See merge request !11937
| * | | | | | | | | | | | | | | | | | | | | Environment detail viewAnnabel Dunstone Gray2017-06-067-22/+33
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch '27148-limit-bulk-create-memberships' into 'master'Douwe Maan2017-06-067-14/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit non-administrators to adding 100 members at a time to groups and projects Closes #27148 See merge request !11940
| * | | | | | | | | | | | | | | | | | | | | Limit non-administrators to adding 100 members at a time to groups and projectsNick Thomas2017-06-067-14/+57
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix_commits_page' into 'master'Filipa Lacerda2017-06-066-9/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplication of commits header on commits page Closes #13879 See merge request !11006
| * | | | | | | | | | | | | | | | | | | | | Fix duplication of commits header on commits pageblackst0ne2017-06-036-9/+75
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'single-click-filter' into 'master'Phil Hughes2017-06-065-64/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change from double click to single click to open dropdown Closes #31757 See merge request !11943
| * | | | | | | | | | | | | | | | | | | | | Change from double click to single click to open dropdownsingle-click-filterClement Ho2017-06-065-64/+22
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch '33279_pc_application_settings_performance' into 'master'Rémy Coutable2017-06-064-25/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redesign caching of application settings See merge request !11894
| * | | | | | | | | | | | | | | | | | | | | redesign caching of application settingsPaul Charlton2017-06-064-25/+43
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fix/encoding-binary-issue' into 'master'Rémy Coutable2017-06-063-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix binary encoding error on MR diffs Closes #32670 See merge request !11929
| * | | | | | | | | | | | | | | | | | | | | Fix binary encoding error on MR diffsJames Lopez2017-06-063-1/+16
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-test_env-set_repo_refs' into 'master'Robert Speicher2017-06-061-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually clean gitlab-test path when TestEnv.set_repo_refs fails See merge request !11939
| * | | | | | | | | | | | | | | | | | | | Actually clean gitlab-test path when TestEnv.set_repo_refs failsRémy Coutable2017-06-061-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | Merge branch '31656-fix-hyperlink-a11y' into 'master'Phil Hughes2017-06-066-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing tooltip and ARIA labels for accessibility Closes #31656 See merge request !11907