summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-2821-49/+65
* Merge branch 'rs-empty_project-features' into 'master'Rémy Coutable2017-07-28148-213/+217
|\
| * 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
| * 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 groupZ.J. van de Weg2017-07-286-0/+42
* | | 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 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 bundlerJacob Vosmaer2017-07-272-2/+2
* | | | Merge branch 'backport-refator-git-push-service-spec' into 'master'Douwe Maan2017-07-281-100/+99
|\ \ \ \
| * | | | 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 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
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'sh-augment-lograge-output'Sean McGivern2017-07-288-19/+43
| |\ \ \ \ \ \
| * | | | | | | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-outputStan Hu2017-07-282-1/+14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'tc-api-root-merge-requests' into 'master'Sean McGivern2017-07-287-51/+291
|\ \ \ \ \ \ \
| * | | | | | | Modify/add some forgotten issues API documentationtc-api-root-merge-requestsToon Claes2017-07-282-20/+24
| * | | | | | | Default /merge_request API endpoint to `scope=created-by-me`Toon Claes2017-07-283-8/+31
| * | | | | | | Add top-level /merge_requests API endpointToon Claes2017-07-275-31/+244
* | | | | | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into...Tim Zallmann2017-07-2810-270/+243
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | 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
| * | | | | | | resolve consistent-return eslint violationMike Greiling2017-07-281-5/+3
| * | | | | | | 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
| * | | | | | | 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 sectionsh-fix-lograge-exceptionStan Hu2017-07-281-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-286-13/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Display specific error message when JIRA test fails32483-jira-errorJarka Kadlecova2017-07-276-13/+38
* | | | | | | | | Merge branch '35667-indicate-type-of-metric-for-prometheus-web-application-mo...Tim Zallmann2017-07-281-4/+4
|\ \ \ \ \ \ \ \ \