| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add info about artifacts object storage in docsdocs/object-storage | Achilleas Pipinellis | 2017-06-16 | 1 | -1/+13 |
| | | |||||
| * | Merge branch 'issue-board-docs' into 'master' | Achilleas Pipinellis | 2017-06-16 | 1 | -2/+3 |
| |\ | | | | | | | | | Issue board docs See merge request !12197 | ||||
| | * | Update issue_board.mdissue-board-docs | Victor Wu | 2017-06-15 | 1 | -2/+3 |
| | | | |||||
| * | | Merge branch 'jira-integ-docs' into 'master' | Achilleas Pipinellis | 2017-06-16 | 2 | -3/+3 |
| |\ \ | | | | | | | | | | | | | Jira integ docs See merge request !12196 | ||||
| | * | | Jira integ docs | Victor Wu | 2017-06-16 | 2 | -3/+3 |
| |/ / | |||||
| * | | Merge branch 'confidential-issues-redesign-docs' into 'master' | Achilleas Pipinellis | 2017-06-16 | 2 | -3/+2 |
| |\ \ | | | | | | | | | | | | | Confidential issues redesign docs See merge request !12195 | ||||
| | * | | Update confidential_issues.mdconfidential-issues-redesign-docs | Victor Wu | 2017-06-15 | 1 | -3/+2 |
| | | | | |||||
| | * | | Replace confidential_issues_issue_page.png | Victor Wu | 2017-06-15 | 1 | -0/+0 |
| | | | | |||||
| * | | | Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master' | Jacob Schatz | 2017-06-15 | 1 | -2/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | Update ruby metrics endpoint text to be clearer See merge request !12157 | ||||
| | * | | | Update ruby metrics endpoint text to be clearer | Joshua Lambert | 2017-06-15 | 1 | -2/+3 |
| |/ / / | |||||
| * | | | Merge branch 'feature/unify-email-layouts' into 'master' | Robert Speicher | 2017-06-15 | 12 | -294/+157 |
| |\ \ \ | | | | | | | | | | | | | | | | | Unify email layouts: devise emails See merge request !10483 | ||||
| | * | | | gitlab.com contrib footer only for devise mails | Alexis Reigel | 2017-06-13 | 2 | -15/+18 |
| | | | | | |||||
| | * | | | inline the only once used template | Alexis Reigel | 2017-06-13 | 2 | -5/+3 |
| | | | | | |||||
| | * | | | add changelog | Alexis Reigel | 2017-06-13 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | add contribution footer to all emails | Alexis Reigel | 2017-06-13 | 1 | -0/+16 |
| | | | | | |||||
| | * | | | use common devise layout and use heading style | Alexis Reigel | 2017-06-13 | 10 | -292/+118 |
| | | | | | |||||
| | * | | | add view helper for mail heading | Alexis Reigel | 2017-06-13 | 1 | -0/+13 |
| | | | | | |||||
| | * | | | use common layout for devise mailer | Alexis Reigel | 2017-06-13 | 3 | -23/+23 |
| | | | | | |||||
| | * | | | add layout for default email content | Alexis Reigel | 2017-06-13 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge branch 'sh-support-cdns' into 'master' | Robert Speicher | 2017-06-15 | 2 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Support a configurable Rails asset_host to allow for CDNs See merge request !12102 | ||||
| | * | | | | Add a link to how to set Omnibus environment variables | Stan Hu | 2017-06-15 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | Rename CDN_HOST to GITLAB_CDN_HOST | Stan Hu | 2017-06-15 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Document CDN_HOST in enviornment variables table | Stan Hu | 2017-06-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | Support a configurable Rails asset_host to allow for CDNs | Stan Hu | 2017-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Adds support for https://gitlab.com/gitlab-com/infrastructure/issues/57 | ||||
| * | | | | | Merge branch 'docs/add-link-to-migrations-spec-doc' into 'master' | Grzegorz Bizon | 2017-06-15 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add a link to spec/migrations/README.md in the testing documentation See merge request !12191 | ||||
| | * | | | | | Add a link to spec/migrations/README.md in the testing documentationdocs/add-link-to-migrations-spec-doc | Rémy Coutable | 2017-06-15 | 1 | -1/+1 |
| | | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Merge branch 'deserialize-custom-notifications' into 'master' | Robert Speicher | 2017-06-15 | 10 | -27/+284 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Deserialize custom notifications Closes #24892 See merge request !12055 | ||||
| | * | | | | Deserialise existing custom notification settingsdeserialize-custom-notifications | Sean McGivern | 2017-06-15 | 9 | -12/+236 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a post-deployment migration to update all existing notification settings with at least one custom level enabled to the new format. Also handle the same conversion when updating settings, to catch any stragglers. | ||||
| | * | | | | Add columns for custom notification settings | Sean McGivern | 2017-06-15 | 4 | -20/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns for each custom notification level, defaulting to null. Read from those columns if non-null, otherwise fall back to the serialized column. Writing will write to the new column if `events` isn't manually set. | ||||
| * | | | | | Merge branch '33614-try-to-fix-transient-failure' into 'master' | Robert Speicher | 2017-06-15 | 1 | -2/+2 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Try to use the same pattern as other spec in this file Closes #33614 See merge request !12192 | ||||
| | * | | | | Try to use the same pattern as other spec in this file33614-try-to-fix-transient-failure | Rémy Coutable | 2017-06-15 | 1 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Merge branch 'docs-registry-hostname-part-of-service-hostname' into 'master'33745-issue-closing-pattern-does-not-work-for-secondary-issues-when-using-full-urls | Rémy Coutable | 2017-06-15 | 1 | -0/+12 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Service hostname also include registry name, when using non Docker Hub registry. See merge request !11729 | ||||
| | * | | | | Language typos fixed | Matej Zerovnik | 2017-06-12 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Service hostname also include registry name, when using non Docker Hub registry. | Matej | 2017-05-26 | 1 | -0/+12 |
| | | | | | | |||||
| * | | | | | Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master' | Annabel Dunstone Gray | 2017-06-15 | 1 | -2/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file diff title and renames alignment in discussions Closes #31782 See merge request !12169 | ||||
| | * | | | | | Fix file diff title and renames alignment in discussions31782-fix-diff-discussion-file-title-misalignment | Eric Eastwood | 2017-06-14 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31782 The unused toggle was removed previously, https://gitlab.com/gitlab-org/gitlab-ce/commit/cc37d1dfa11691f2d8357151d4b722b3d114881e#cf11229dd714f7f4b46f102ce6846e25528b6689_7_6 | ||||
| * | | | | | | Merge branch 'deprecate-gitaly-path' into 'master' | Sean McGivern | 2017-06-15 | 9 | -23/+361 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Stop using deprecated `path` field on Gitaly messages See merge request !12112 | ||||
| | * | | | | | Stop using deprecated `path` field on Gitaly messages | Alejandro Rodríguez | 2017-06-14 | 9 | -23/+361 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This revealed an error in our configuration generation in gitlab:gitaly:install rake task. The fix is included | ||||
| * | | | | | | Merge branch '13336-multiple-broadcast-messages' into 'master' | Rémy Coutable | 2017-06-15 | 7 | -19/+61 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #13336 - display multiple messages in both the UI and git output Closes #13336 See merge request !11113 | ||||
| | * | | | | | | #13336 - display multiple messages in both the UI and git output | Mike Ricketts | 2017-06-15 | 7 | -19/+61 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'docs/gb/document-new-migrations-testing-technique' into 'master' | Rémy Coutable | 2017-06-15 | 1 | -0/+87 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document a new migrations testing technique Closes #33565 See merge request !12181 | ||||
| | * | | | | | | Document a new migrations testing techniquedocs/gb/document-new-migrations-testing-technique | Grzegorz Bizon | 2017-06-15 | 1 | -0/+87 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '23998-blame-age-map' into 'master' | Annabel Dunstone Gray | 2017-06-15 | 7 | -3/+158 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add age color mapping to blame view Closes #23998 See merge request !7198 | ||||
| | * | | | | | | | Add blame view age map | Jeff Stubler | 2017-06-14 | 7 | -3/+158 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'sh-fix-spec-helper-ee-consistency' into 'master' | Rémy Coutable | 2017-06-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make spec/spec_helper consistent with EE by including a :routing type See merge request !12178 | ||||
| | * | | | | | | | | Make spec/spec_helper consistent with EE by including a :routing typesh-fix-spec-helper-ee-consistency | Stan Hu | 2017-06-14 | 1 | -0/+1 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'fix-manual-actions' into 'master' | Grzegorz Bizon | 2017-06-15 | 5 | -5/+25 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show manual actions that cannot be run Closes #32380 See merge request !12121 | ||||
| | * | | | | | | | | Do not show manual actions that cannot be runfix-manual-actions | Kamil Trzcinski | 2017-06-13 | 5 | -5/+25 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'backport-merge_params-conflict-message-to-ce-master' into 'master' | Sean McGivern | 2017-06-15 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Backport merge_params.html.haml conflict comment See merge request !12138 | ||||
| | * | | | | | | | | Improve conflict message in _merge_params.html.haml | Luke "Jared" Bennett | 2017-06-14 | 1 | -1/+2 |
| | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |