summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bring web IDE docs to CEdocs-web-idePhil Hughes2018-04-123-0/+23
* Merge branch '42613-clean-up-old-project-permissions-frontend-code' into 'mas...Clement Ho2018-04-129-418/+16
|\
| * Resolve "Clean up old project permissions frontend code"Mike Greiling2018-04-129-418/+16
|/
* Merge branch '45287-align-icons' into 'master'Phil Hughes2018-04-122-7/+6
|\
| * Align action icons in pipeline graphFilipa Lacerda2018-04-122-7/+6
* | Merge branch 'jousch/gitlab-ce-ci-untracked-doku-docs' into 'master'Rémy Coutable2018-04-121-30/+49
|\ \
| * | Add dedicated info about artifacts:untracked to GitLab CI's README.mdJosef Glatz2018-04-121-30/+49
* | | Merge branch '5103-mention-reply-by-email-in-user-docs' into 'master'Achilleas Pipinellis2018-04-121-0/+5
|\ \ \
| * | | Mention reply-by-email in user docLin Jen-Shin2018-04-121-0/+5
* | | | Merge branch 'workhorse-4-1-0' into 'master'Douwe Maan2018-04-121-1/+1
|\ \ \ \
| * | | | Update GitLab Workhorse to v4.1.0Nick Thomas2018-04-121-1/+1
* | | | | Merge branch 'docs-update-instal-guide-10-7' into 'master'James Lopez2018-04-122-1/+362
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix indentationFilipa Lacerda2018-04-121-1/+1
| * | | | Updates missing linksFilipa Lacerda2018-04-121-7/+7
| * | | | Updates installation and update guidesFilipa Lacerda2018-04-122-1/+362
* | | | | Merge branch '10-7-update-files' into 'master'James Lopez2018-04-1219-17/+81
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update the .gitignore, .gitlab-ci.yml, and Dockerfile templatesFilipa Lacerda2018-04-1219-17/+81
| |/ / /
* | | | Merge branch 'move-help-state-vue-component' into 'master'Filipa Lacerda2018-04-123-25/+33
|\ \ \ \
| * | | | Move TimeTrackingHelpState vue componentGeorge Tsiolis2018-04-113-25/+33
* | | | | Merge branch 'winh-dropdown-entry-unlocking' into 'master'Phil Hughes2018-04-122-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove green background from unlock button in admin areaWinnie Hellmann2018-04-102-1/+6
* | | | | Merge branch 'backport-of-rd-3429-enabling-maximum-file-size-limit-in-reposit...Douwe Maan2018-04-1211-19/+260
|\ \ \ \ \
| * | | | | Backport of EE !4989backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-failRubén Dávila2018-04-1111-19/+260
* | | | | | Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan2018-04-1238-98/+254
|\ \ \ \ \ \
| * | | | | | Support Markdown rendering using multiple projectsrendering-markdown-multiple-projectsYorick Peterse2018-04-1138-98/+254
* | | | | | | Merge branch '41436-use-simpler-env-vars-for-auto-devops-replicas' into 'master'Achilleas Pipinellis2018-04-122-18/+24
|\ \ \ \ \ \ \
| * | | | | | | Update Auto-Devops docs to mention new REPLICAS env varDylan Griffith2018-04-122-18/+24
|/ / / / / / /
* | | | | | | Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'Marin Jankovski2018-04-125-3/+29
|\ \ \ \ \ \ \
| * | | | | | | Fix tests for job empty states for a failed buildGrzegorz Bizon2018-04-111-2/+2
| * | | | | | | Show build trace placeholder when build is runningGrzegorz Bizon2018-04-111-1/+1
| * | | | | | | Add a test for job empty state with missing traceGrzegorz Bizon2018-04-112-1/+12
| * | | | | | | Revert adding `Empty` extended status to avoid N+1 queriesGrzegorz Bizon2018-04-115-59/+5
| * | | | | | | Extend specs for detailed build extended statusesGrzegorz Bizon2018-04-114-6/+46
| * | | | | | | Fix empty state for build that doesn ot have a traceGrzegorz Bizon2018-04-113-1/+30
* | | | | | | | Merge branch '45245-rspec-flaky-pruner-failure-job-failed-62392094' into 'mas...Grzegorz Bizon2018-04-122-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix scripts/prune-old-flaky-specs requires Bundler to runRémy Coutable2018-04-112-2/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'fix/wiki-find-file-gitaly' into 'master'Robert Speicher2018-04-114-3/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix finding wiki file when Gitaly is enabledAhmad Sherif2018-04-114-3/+16
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'mk/geo/backport-broadcast-message-cache-expiration-hook' into '...Nick Thomas2018-04-112-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport: Propagate broadcast messages to secondariesMichael Kozono2018-04-112-2/+10
| |/ / / / / / /
* | | | | | | | Merge branch 'winh-protection-push-dropdowns-backport' into 'master'Clement Ho2018-04-113-7/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Limit dropdown toggle width for protected branches / tagswinh-protection-push-dropdowns-backportWinnie Hellmann2018-04-053-7/+2
* | | | | | | | | Merge branch 'winh-sprintf-no-escape-docs' into 'master'Clement Ho2018-04-111-3/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Document example for sprintf without escapingWinnie Hellmann2018-04-111-3/+14
* | | | | | | | | | Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master'Clement Ho2018-04-113-34/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add i18n and update specs for UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-273-34/+33
* | | | | | | | | | | Merge branch '41748-vertical-misalignment-login-box' into 'master'Clement Ho2018-04-1110-32/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactor CSS to eliminate vertical misalignment of login navTakuya Noguchi2018-04-1110-32/+21
* | | | | | | | | | | | Merge branch 'winh-single-karma-test' into 'master'Clement Ho2018-04-115-13/+59
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | use commander for safer cli argument parsingLukas Eipert2018-04-114-14/+23