summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-289-23/+19
* | | | | | | | | Merge branch 'log_webhook_timeout' into 'master'Rémy Coutable2017-07-281-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Log web hook execution timeout eventsAlex Lossent2017-07-271-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '35691-images-in-wiki-display-have-wrong-size' into 'master'Filipa Lacerda2017-07-281-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | none is not a CSS Value for sizes ;-)Tim Zallmann2017-07-281-3/+3
* | | | | | | | | Merge branch 'help-page-breadcrumb-title-fix' into 'master'Filipa Lacerda2017-07-281-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed the breadcrumb title for help pageshelp-page-breadcrumb-title-fixPhil Hughes2017-07-281-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ph-inline-js' into 'master'Tim Zallmann2017-07-2823-112/+135
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed form action not submitting the correct URLph-inline-jsPhil Hughes2017-07-281-1/+6
| * | | | | | | | | Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-2855-134/+737
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-2753-165/+393
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | fixed label subscription & merge conflictsPhil Hughes2017-07-263-3/+14
| * | | | | | | | | | moved some more inline codePhil Hughes2017-07-256-15/+20
| * | | | | | | | | | moved some code into new filesPhil Hughes2017-07-256-41/+52
| * | | | | | | | | | Removed inline JS in shared HAML filesPhil Hughes2017-07-2516-101/+90
* | | | | | | | | | | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'Kamil Trzciński2017-07-286-5/+74
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix revert missShinya Maeda2017-07-281-1/+1
| * | | | | | | | | | Revert "Move validate to begin/rescue block"Shinya Maeda2017-07-281-25/+14
| * | | | | | | | | | Remove is_a?(Hash) from unless params[:variables] in create_pipeline_variablesShinya Maeda2017-07-281-1/+1
| * | | | | | | | | | Use bang for trigger.trigger_requests.createShinya Maeda2017-07-281-1/+1
| * | | | | | | | | | Remove if pipeline.variables in Ci::Build#variablesShinya Maeda2017-07-281-1/+1
| * | | | | | | | | | Fix pipelineShinya Maeda2017-07-281-12/+18
| * | | | | | | | | | Move validate to begin/rescue blockShinya Maeda2017-07-281-14/+19
| * | | | | | | | | | fix merge missShinya Maeda2017-07-281-1/+1
| * | | | | | | | | | initShinya Maeda2017-07-286-6/+75
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'zj-delete-mm-team' into 'master'Douwe Maan2017-07-282-0/+11
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Remove Mattermost team with GitLab groupZ.J. van de Weg2017-07-282-0/+11
* | | | | | | | | | Global nav (9.0) UI improvementTakuya Noguchi2017-07-283-8/+8
* | | | | | | | | | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-281-6/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-271-6/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-augment-lograge-output' into 'master'Sean McGivern2017-07-281-0/+10
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'sh-augment-lograge-output'Sean McGivern2017-07-282-3/+7
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-outputStan Hu2017-07-281-0/+10
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tc-api-root-merge-requests' into 'master'Sean McGivern2017-07-281-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add top-level /merge_requests API endpointToon Claes2017-07-271-0/+1
* | | | | | | | | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into...Tim Zallmann2017-07-288-266/+241
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
| * | | | | | | | | | refactor users bundle, remove inline javascript, and transform into an async ...Mike Greiling2017-07-184-48/+25
| * | | | | | | | | | refactor async calendar dataMike Greiling2017-07-185-18/+27
* | | | | | | | | | | Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-282-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |