summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed breadcrumb titles aggressively collapsingbreadcrumbs-collapsed-title-width-fixPhil Hughes2017-07-282-1/+6
| | | | Closes #35323
* Merge branch 'sh-augment-lograge-output' into 'master'Sean McGivern2017-07-282-1/+14
|\ | | | | | | | | Add remote IP, user ID and username to JSON lograge output See merge request !13147
| * Merge branch 'master' into 'sh-augment-lograge-output'Sean McGivern2017-07-288-19/+43
| |\ | | | | | | | | | # Conflicts: # config/initializers/lograge.rb
| * | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-outputStan Hu2017-07-282-1/+14
| | | | | | | | | | | | This makes the logs a bit more useful to search requests by users.
* | | Merge branch 'tc-api-root-merge-requests' into 'master'Sean McGivern2017-07-287-51/+291
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add top-level /merge_requests API endpoint Closes #28422 See merge request !13060
| * | | Modify/add some forgotten issues API documentationtc-api-root-merge-requestsToon Claes2017-07-282-20/+24
| | | | | | | | | | | | | | | | Should have been part of !13004.
| * | | Default /merge_request API endpoint to `scope=created-by-me`Toon Claes2017-07-283-8/+31
| | | | | | | | | | | | | | | | This matches the behavior of the /issues endpoint.
| * | | Add top-level /merge_requests API endpointToon Claes2017-07-275-31/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And add support for additional query parameters: - `author_id`: Returns merge requests created by the given user `id` - `assignee_id`: Returns merge requests assigned to the given user `id` - `scope`: Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`
* | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' ↵Tim Zallmann2017-07-2810-270/+243
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Transform user profile javascript into async bundle" Closes #35224 See merge request !12929
| * | | resolve remaining eslint violations35224-transform-user-profile-javascript-into-async-bundleMike Greiling2017-07-282-63/+58
| | | |
| * | | resolve eqeqeq, newline-per-chained-call, no-unused-vars, and no-else-return ↵Mike Greiling2017-07-281-10/+11
| | | | | | | | | | | | | | | | eslint violations
| * | | resolve consistent-return eslint violationMike Greiling2017-07-281-5/+3
| | | | | | | | | | | | | | | | [ci-skip]
| * | | resolve prefer-template and quotes eslint violationsMike Greiling2017-07-281-7/+14
| | | |
| * | | resolve no-mixed-operators and no-return-assign eslint violationsMike Greiling2017-07-281-6/+6
| | | |
| * | | resolve comma-dangle and object-shorthand eslint violationsMike Greiling2017-07-281-23/+12
| | | |
| * | | resolve camelcase violationsMike Greiling2017-07-281-9/+6
| | | |
| * | | remove janky function binding in activity calendar classMike Greiling2017-07-281-45/+55
| | | |
| * | | fix all eslint violations in user_tabs.jsMike Greiling2017-07-281-80/+73
| | | |
| * | | remove implied "GET" http method optionMike Greiling2017-07-271-1/+0
| | | |
| * | | remove needless brackets object accessor syntaxMike Greiling2017-07-271-2/+2
| | | |
| * | | fix broken testsMike Greiling2017-07-191-2/+2
| | | |
| * | | refactor users bundle, remove inline javascript, and transform into an async ↵Mike Greiling2017-07-185-50/+25
| | | | | | | | | | | | | | | | chunk
| * | | refactor async calendar dataMike Greiling2017-07-185-18/+27
| | | |
* | | | Merge branch 'sh-fix-lograge-exception' into 'master'Sean McGivern2017-07-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix lograge exclusion in params section See merge request !13146
| * | | | Fix lograge exclusion in params sectionsh-fix-lograge-exceptionStan Hu2017-07-281-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, we would just see redundant entries in the `params` section: ``` {"method":"GET","path":"/-/metrics","format":"html","controller":"MetricsController","action":"index","status":404,"duration":1.42,"view":0.38,"db":0.0,"time":"2017-07-28T02:59:18.167Z","params":{"controller":"metrics","action":"index"}} ``` The intended format looks more like this: ``` {"method":"GET","path":"/-/metrics","format":"html","controller":"MetricsController","action":"index","status":404,"duration":76.32,"view":69.95,"db":0.0,"time":"2017-07-28T02:59:48.893Z","params":{}} ``` The proper form to exclude an array is to preface with an asterisk: https://apidock.com/rails/Hash/except
* | | | Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-286-13/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display specific error message when JIRA test fails Closes #32483 See merge request !13100
| * | | | Display specific error message when JIRA test fails32483-jira-errorJarka Kadlecova2017-07-276-13/+38
| | | | |
* | | | | Merge branch ↵Tim Zallmann2017-07-281-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35667-indicate-type-of-metric-for-prometheus-web-application-monitoring' into 'master' Indicate type of metric for Prometheus web application monitoring Closes #35667 See merge request !13142
| * | | | | Rename the metric groups35667-indicate-type-of-metric-for-prometheus-web-application-monitoringJoshua Lambert2017-07-271-4/+4
| | | | | |
* | | | | | Merge branch ↵Achilleas Pipinellis2017-07-281-2/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35657-fix-prometheus-docs-to-indicate-kubernetes-is-not-required-docs' into 'master' Fix Prometheus docs to indicate Kubernetes is not required - docs Closes #35657 See merge request !13140
| * | | | | Update environments.md35657-fix-prometheus-docs-to-indicate-kubernetes-is-not-required-docsJoshua Lambert2017-07-271-2/+1
| | | | | |
* | | | | | Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-278-170/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all ApplicationSettings attributes to the API See merge request !12851
| * | | | | | Remove deprecated `repository_storage` attributebvl-add-all-settings-to-apiBob Van Landuyt2017-07-274-60/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In favor of the new `repository_storages`
| * | | | | | Make the attribute list for application settings reusableBob Van Landuyt2017-07-275-110/+96
| | | | | | |
* | | | | | | Merge branch 'gitaly-all-branches' into 'master'Robert Speicher2017-07-275-319/+77
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate RefsService.FindAllBranches Gitaly RPC Closes gitaly#408 See merge request !13027
| * | | | | | Incorporate RefsService.FindAllBranches Gitaly RPCgitaly-all-branchesAlejandro Rodríguez2017-07-275-7/+40
| | | | | | |
| * | | | | | Improve Gitlab::Git::Repository specs for #branchesAlejandro Rodríguez2017-07-271-14/+39
| | | | | | |
| * | | | | | Remove unused Gitlab::Git operationsAlejandro Rodríguez2017-07-272-300/+0
| | | | | | |
* | | | | | | Merge branch 'ch-test-removal' into 'master'Jacob Schatz2017-07-271-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused haml file See merge request !13090
| * | | | | | | Test remove potentially unused filech-test-removalClement Ho2017-07-261-1/+0
| | | | | | | |
* | | | | | | | Merge branch 'update-server-terms-for-ha-docs' into 'master'Drew Blessing2017-07-271-9/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update server terminolgy to differentiate HA setups from Geo See merge request !13139
| * | | | | | | Update server terminolgy to differentiate HA setups from GeoChenjerai Katanda2017-07-271-9/+9
|/ / / / / / /
* | | | | | | Merge branch 'feature/migrate-repository-tags-to-gitaly' into 'master'Robert Speicher2017-07-276-31/+80
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#tags to Gitaly Closes gitaly#411 See merge request !13092
| * | | | | | | Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitalyAhmad Sherif2017-07-276-31/+80
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Closes gitaly#411
* | | | | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-279-9/+81
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent concurrent editing wiki Closes #1827 See merge request !9707
| * | | | | | | Encapsulate the commit.sha logicHiroyuki Sato2017-07-273-6/+32
| | | | | | | |
| * | | | | | | Use simplified routeHiroyuki Sato2017-07-271-1/+1
| | | | | | | |
| * | | | | | | Remove unnecessary codeHiroyuki Sato2017-07-261-1/+0
| | | | | | | |
| * | | | | | | Update changelog appropriatelyHiroyuki Sato2017-07-261-1/+1
| | | | | | | |
| * | | | | | | Fix error of spinach testHiroyuki Sato2017-07-231-1/+1
| | | | | | | |
View Lorry Controller Status