summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-2821-49/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having two states that essentially mean the same thing is very much like having a boolean "true" and boolean "mostly-true": it's rather silly. This commit merges the "reopened" state into the "opened" state while taking care of system notes still showing messages along the lines of "Alice reopened this issue". A big benefit from having only two states (opened and closed) is that indexing and querying becomes simpler and more performant. For example, to get all the opened queries we no longer have to query both states: SELECT * FROM issues WHERE project_id = 2 AND state IN ('opened', 'reopened'); Instead we can query a single state directly, which can be much faster: SELECT * FROM issues WHERE project_id = 2 AND state = 'opened'; Further, only having two states makes indexing easier as we will only ever filter (and thus scan an index) using a single value. Partial indexes could help but aren't supported on MySQL, complicating the development process and not being helpful for MySQL.
* Merge branch 'rs-empty_project-features' into 'master'Rémy Coutable2017-07-28148-213/+217
|\ | | | | | | | | Use `:empty_project` where possible in feature specs See merge request !13118
| * Use `empty_project` where possible in spec/features/securityrs-empty_project-featuresRobert Speicher2017-07-276-6/+9
| |
| * Use `empty_project` where possible in spec/features/merge_requestsRobert Speicher2017-07-2729-42/+42
| |
| * Use `empty_project` where possible in spec/features/issuesRobert Speicher2017-07-2718-30/+30
| |
| * Use `empty_project` where possible in spec/features/projectsRobert Speicher2017-07-2773-97/+95
| |
| * Use `empty_project` where possible in spec/features/issuablesRobert Speicher2017-07-272-3/+3
| | | | | | | | (It wasn't possible.)
| * Use `empty_project` where possible in spec/features/atomRobert Speicher2017-07-274-5/+5
| |
| * Use `empty_project` where possible in spec/features/profilesRobert Speicher2017-07-271-3/+3
| |
| * Use `empty_project` where possible in spec/features/exploreRobert Speicher2017-07-271-1/+1
| |
| * Use `empty_project` where possible in spec/features/groupsRobert Speicher2017-07-273-5/+5
| |
| * Use `empty_project` where possible in spec/features/adminRobert Speicher2017-07-274-11/+14
| |
| * Use `empty_project` where possible in spec/features/dashboardRobert Speicher2017-07-277-10/+10
| |
* | Merge branch 'zj-delete-mm-team' into 'master'Douwe Maan2017-07-286-0/+42
|\ \ | | | | | | | | | | | | | | | | | | Remove Mattermost team with GitLab group Closes #30023 See merge request !11362
| * | Remove Mattermost team with GitLab groupZ.J. van de Weg2017-07-286-0/+42
| | | | | | | | | | | | | | | | | | | | | When destroying a group, now an API call is made to the Mattermost server to request the deletion of the project. Actual team deletion on the Mattermost side happens async, so the runtime shouldn't increase by more than a second.
* | | Merge branch '34921-global-dropdown-ui-improvement' into 'master'35691-images-in-wiki-display-have-wrong-sizePhil Hughes2017-07-284-8/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Global nav (9.0) UI improvement Closes #34921 See merge request !12772
| * | | Global nav (9.0) UI improvementTakuya Noguchi2017-07-284-8/+12
|/ / /
* | | Merge branch 'gitaly-ruby-bundler' into 'master'Sean McGivern2017-07-282-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Support the fact that Gitaly uses bundler See merge request !13135
| * | | Support the fact that Gitaly uses bundlerJacob Vosmaer2017-07-272-2/+2
| | | |
* | | | Merge branch 'backport-refator-git-push-service-spec' into 'master'Douwe Maan2017-07-281-100/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [Backport from EE] Refactors GitPushService spec code See merge request !13148
| * | | | refactors git push service spec codebackport-refator-git-push-service-specTiago Botelho2017-07-281-100/+99
| | | | |
* | | | | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-283-11/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport some recent changes related to LDAP from EE See merge request !13119
| * | | | | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-273-11/+15
| | | | | |
* | | | | | 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
View Lorry Controller Status