summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'confidential-issues-redesign-docs' into 'master'Achilleas Pipinellis2017-06-162-3/+2
|\
| * Update confidential_issues.mdconfidential-issues-redesign-docsVictor Wu2017-06-151-3/+2
| * Replace confidential_issues_issue_page.pngVictor Wu2017-06-151-0/+0
* | Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master'Jacob Schatz2017-06-151-2/+3
|\ \
| * | Update ruby metrics endpoint text to be clearerJoshua Lambert2017-06-151-2/+3
|/ /
* | Merge branch 'feature/unify-email-layouts' into 'master'Robert Speicher2017-06-1512-294/+157
|\ \
| * | gitlab.com contrib footer only for devise mailsAlexis Reigel2017-06-132-15/+18
| * | inline the only once used templateAlexis Reigel2017-06-132-5/+3
| * | add changelogAlexis Reigel2017-06-131-0/+4
| * | add contribution footer to all emailsAlexis Reigel2017-06-131-0/+16
| * | use common devise layout and use heading styleAlexis Reigel2017-06-1310-292/+118
| * | add view helper for mail headingAlexis Reigel2017-06-131-0/+13
| * | use common layout for devise mailerAlexis Reigel2017-06-133-23/+23
| * | add layout for default email contentAlexis Reigel2017-06-131-0/+3
* | | Merge branch 'sh-support-cdns' into 'master'Robert Speicher2017-06-152-1/+5
|\ \ \
| * | | Add a link to how to set Omnibus environment variablesStan Hu2017-06-151-0/+3
| * | | Rename CDN_HOST to GITLAB_CDN_HOSTStan Hu2017-06-152-2/+2
| * | | Document CDN_HOST in enviornment variables tableStan Hu2017-06-141-0/+1
| * | | Support a configurable Rails asset_host to allow for CDNsStan Hu2017-06-141-1/+1
* | | | Merge branch 'docs/add-link-to-migrations-spec-doc' into 'master'Grzegorz Bizon2017-06-151-1/+1
|\ \ \ \
| * | | | Add a link to spec/migrations/README.md in the testing documentationdocs/add-link-to-migrations-spec-docRémy Coutable2017-06-151-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'deserialize-custom-notifications' into 'master'Robert Speicher2017-06-1510-27/+284
|\ \ \ \
| * | | | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-159-12/+236
| * | | | Add columns for custom notification settingsSean McGivern2017-06-154-20/+53
* | | | | Merge branch '33614-try-to-fix-transient-failure' into 'master'Robert Speicher2017-06-151-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Try to use the same pattern as other spec in this file33614-try-to-fix-transient-failureRémy Coutable2017-06-151-2/+2
|/ / / /
* | | | Merge branch 'docs-registry-hostname-part-of-service-hostname' into 'master'33745-issue-closing-pattern-does-not-work-for-secondary-issues-when-using-full-urlsRémy Coutable2017-06-151-0/+12
|\ \ \ \
| * | | | Language typos fixedMatej Zerovnik2017-06-121-2/+2
| * | | | Service hostname also include registry name, when using non Docker Hub registry.Matej2017-05-261-0/+12
* | | | | Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master'Annabel Dunstone Gray2017-06-151-2/+3
|\ \ \ \ \
| * | | | | Fix file diff title and renames alignment in discussions31782-fix-diff-discussion-file-title-misalignmentEric Eastwood2017-06-141-2/+3
* | | | | | Merge branch 'deprecate-gitaly-path' into 'master'Sean McGivern2017-06-159-23/+361
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Stop using deprecated `path` field on Gitaly messagesAlejandro Rodríguez2017-06-149-23/+361
* | | | | | Merge branch '13336-multiple-broadcast-messages' into 'master'Rémy Coutable2017-06-157-19/+61
|\ \ \ \ \ \
| * | | | | | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-157-19/+61
|/ / / / / /
* | | | | | Merge branch 'docs/gb/document-new-migrations-testing-technique' into 'master'Rémy Coutable2017-06-151-0/+87
|\ \ \ \ \ \
| * | | | | | Document a new migrations testing techniquedocs/gb/document-new-migrations-testing-techniqueGrzegorz Bizon2017-06-151-0/+87
* | | | | | | Merge branch '23998-blame-age-map' into 'master'Annabel Dunstone Gray2017-06-157-3/+158
|\ \ \ \ \ \ \
| * | | | | | | Add blame view age mapJeff Stubler2017-06-147-3/+158
* | | | | | | | Merge branch 'sh-fix-spec-helper-ee-consistency' into 'master'Rémy Coutable2017-06-151-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Make spec/spec_helper consistent with EE by including a :routing typesh-fix-spec-helper-ee-consistencyStan Hu2017-06-141-0/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-155-5/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not show manual actions that cannot be runfix-manual-actionsKamil Trzcinski2017-06-135-5/+25
* | | | | | | | | Merge branch 'backport-merge_params-conflict-message-to-ce-master' into 'master'Sean McGivern2017-06-151-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Improve conflict message in _merge_params.html.hamlLuke "Jared" Bennett2017-06-141-1/+2
| * | | | | | | | Backport merge_params.html.haml conflict commentLuke "Jared" Bennett2017-06-141-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-153-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Instrument MergeRequestDiff#load_commitsinstrument-merge-request-diff-load-commitsSean McGivern2017-06-143-0/+8
* | | | | | | | | Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-153-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't return nil for missing objects from parser cachedm-fix-parser-cacheDouwe Maan2017-06-143-2/+6
View Lorry Controller Status