summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix button text wrapping to next line60116-fix-button-wrappingAnnabel Dunstone Gray2019-04-051-0/+1
* Merge branch '59719-const-get' into 'master'Robert Speicher2019-04-051-1/+1
|\
| * Switch to Object.const_get59719-const-getThong Kuah2019-04-051-1/+1
| * Do not inherit when calling const_getThong Kuah2019-04-041-1/+1
* | Merge branch 'revert-3962b00b' into 'master'Andreas Brandl2019-04-0522-356/+10
|\ \
| * | Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"Andreas Brandl2019-04-0522-356/+10
* | | Merge branch '57482-shortcut-to-create-merge-request-from-web-ide' into 'master'Phil Hughes2019-04-059-37/+75
|\ \ \
| * | | Shortcut to create MR in web IDE57482-shortcut-to-create-merge-request-from-web-ideSam Bigelow2019-04-049-37/+75
* | | | Merge branch '9201-create-a-user-via-scim-ce' into 'master'Douglas Barbosa Alexandre2019-04-051-1/+5
|\ \ \ \
| * | | | Add saml provider to user build service9201-create-a-user-via-scim-ceJames Lopez2019-04-051-1/+5
* | | | | Merge branch '57668-create-file-from-url' into 'master'Phil Hughes2019-04-053-4/+43
|\ \ \ \ \
| * | | | | Set tree list accounting for already-opened files57668-create-file-from-urlDenys Mishunov2019-04-042-4/+38
| * | | | | Create a new file if URL references non-existent oneDenys Mishunov2019-04-041-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'allow-ref-name-caching-projects-controller' into 'master'Douglas Barbosa Alexandre2019-04-052-0/+4
|\ \ \ \ \
| * | | | | Enable FindCommit caching for project and commits pagesStan Hu2019-04-052-0/+4
| | |_|_|/ | |/| | |
* | | | | Removes the undescriptive CI Charts headerDimitrie Hoekstra2019-04-051-4/+0
|/ / / /
* | | | Move Contribution Analytics related spec in spec/features/groups/group_page_w...Imre Farkas2019-04-0522-10/+356
* | | | Merge branch '57493-add-limit-to-user-name' into 'master'Andreas Brandl2019-04-051-1/+1
|\ \ \ \
| * | | | Add limit of 128 characters to users name57493-add-limit-to-user-nameBrandon Labuschagne2019-04-051-1/+1
* | | | | Fall back to project repository type by defaultBob Van Landuyt2019-04-051-4/+2
* | | | | Merge branch 'keyval-labels' into 'master'Sean McGivern2019-04-0525-54/+374
|\ \ \ \ \
| * | | | | Fix scoped links styling on milestones pageJan Provaznik2019-04-051-2/+1
| * | | | | Fix labels selection, escape text in templateskeyval-labelsKushal Pandya2019-04-051-9/+11
| * | | | | Fix scoped_labels feature checkJan Provaznik2019-04-042-3/+8
| * | | | | [backend] backport of scoped labelsJan Provaznik2019-04-0412-27/+64
| * | | | | [frontend] backport of scoped labelsRajat Jain2019-04-0413-26/+303
| | |/ / / | |/| | |
* | | | | Merge branch '58375-api-controller' into 'master'Sean McGivern2019-04-052-0/+38
|\ \ \ \ \
| * | | | | Allow message strings to be translatedrpereira22019-04-051-2/+2
| * | | | | Call permit! on paramsrpereira22019-04-051-1/+1
| * | | | | Remove permitting of paramsrpereira22019-04-051-12/+5
| * | | | | Add spec for invalid environment idrpereira22019-04-051-2/+1
| * | | | | Streamline controller specsPeter Leitzen2019-04-051-4/+2
| * | | | | Add a Prometheus API per environmentrpereira22019-04-052-0/+48
| * | | | | Some code improvements58375-proxy-servicerpereira22019-04-041-1/+4
| * | | | | Use hash methods to filter paramsrpereira22019-04-041-9/+5
| * | | | | Filter params based on the proxy_pathrpereira22019-04-041-4/+20
| * | | | | Rename prometheus_owner to proxyablerpereira22019-04-041-13/+13
| * | | | | Remove no_proxy check in calculate_reactive_cacherpereira22019-04-041-1/+0
| * | | | | Remove all superfluous bracesrpereira22019-04-041-1/+0
| * | | | | Improvements after reviewrpereira22019-04-041-6/+10
| * | | | | Remove unnecessary linerpereira22019-04-041-6/+0
| * | | | | Add a Prometheus::ProxyServicerpereira22019-04-041-0/+105
* | | | | | Merge branch 'ce-proj-settings-ok-avatar-only' into 'master'Kushal Pandya2019-04-0512-39/+33
|\ \ \ \ \ \
| * | | | | | Improve project avatar settingsce-proj-settings-ok-avatar-onlyLuke Bennett2019-03-2812-39/+33
* | | | | | | Restore multiple series supportAdriel Santiago2019-04-052-8/+24
* | | | | | | Merge branch 'fix-merge-request-relations-with-pipeline-on-mwps' into 'master'Kamil TrzciƄski2019-04-052-14/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix merge requst relationships with pipeline in MWPSServicefix-merge-request-relations-with-pipeline-on-mwpsShinya Maeda2019-04-052-14/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'extend-cte-optimisations-to-projects' into 'master'Dmitriy Zaporozhets2019-04-054-39/+40
|\ \ \ \ \ \ \
| * | | | | | | Extend CTE search optimisation to projectsextend-cte-optimisations-to-projectsSean McGivern2019-04-044-39/+40
* | | | | | | | Merge branch '59162-fix-review-apps-initial-seeding' into 'master'Dmitriy Zaporozhets2019-04-051-0/+7
|\ \ \ \ \ \ \ \