summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Full Width Stylingtz-ide-stylingTim Zallmann2017-11-063-1/+11
|
* Merge branch '39668-tooltip-safari' into 'master'Tim Zallmann2017-11-062-0/+10
|\ | | | | | | | | | | | | Remove native title tooltip in pipeline jobs dropdown in Safari Closes #39668 See merge request gitlab-org/gitlab-ce!15213
| * Remove native title tooltip in pipeline jobs dropdown in Safari39668-tooltip-safariFilipa Lacerda2017-11-062-0/+10
| |
* | Merge branch 'winh-skip-parsePikadayDate-test' into 'master'Filipa Lacerda2017-11-061-4/+2
|\ \ | | | | | | | | | | | | | | | | | | Temporarily remove parsePikadayDate test Closes #39834 See merge request gitlab-org/gitlab-ce!15217
| * | Remove parsePikadayDate testwinh-skip-parsePikadayDate-testWinnie Hellmann2017-11-061-4/+2
| | |
* | | Merge branch 'dm-reallow-project-path-ending-in-period' into 'master'Sean McGivern2017-11-0618-159/+223
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reallow project paths ending in periods Closes #39695 See merge request gitlab-org/gitlab-ce!15190
| * | | Reallow project paths ending in periodsdm-reallow-project-path-ending-in-periodDouwe Maan2017-11-0618-159/+223
| | | |
* | | | Merge branch '38247-hide-create-mr-button-in-issue-show' into 'master'Rémy Coutable2017-11-063-11/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove create MR button from issues when MRs are disabled Closes #38247 See merge request gitlab-org/gitlab-ce!15071
| * | | | Remove create MR button from issues when MRs are disabledGeorge Andrinopoulos2017-11-063-11/+34
|/ / / /
* | | | Merge branch 'winh-use-vue-warnhandler' into 'master'Phil Hughes2017-11-061-18/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Vue warnhandler Closes #33849 See merge request gitlab-org/gitlab-ce!15152
| * | | | Use Vue warnhandlerwinh-use-vue-warnhandlerWinnie Hellmann2017-11-061-18/+22
| | |/ / | |/| |
* | | | Merge branch 'jk-delete-epic-backport' into 'master'Sean McGivern2017-11-066-37/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor issuable destroy action See merge request gitlab-org/gitlab-ce!15203
| * | | | Refactor issuable destroy actionJarka Kadlecova2017-11-066-37/+24
| | | | |
* | | | | Merge branch ↵Sean McGivern2017-11-061-7/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39790-use-the-parallel-rubocop-option-in-the-static-analysis-ci-job' into 'master' Resolve "Use the `--parallel` Rubocop option in the static-analysis CI job" Closes #39790 See merge request gitlab-org/gitlab-ce!15183
| * | | | | Use the --parallel Rubocop flag in the static-analysis and improve the job39790-use-the-parallel-rubocop-option-in-the-static-analysis-ci-jobRémy Coutable2017-11-031-7/+16
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'ignore-legacy-routes-in-routing-spec' into 'master'Douwe Maan2017-11-061-3/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ignore routes matching legacy_*_redirect in route specs See merge request gitlab-org/gitlab-ce!15208
| * | | | | Ignore routes matching legacy_*_redirect in route specsSean McGivern2017-11-061-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Routes with the name `legacy_*_redirect` may have wildcards deliberately, in order to support routing old paths to new paths. As long as these routes are tested independently, they do not need to fail the path regex spec.
* | | | | | Merge branch '38597-editor-icons' into 'master'Phil Hughes2017-11-0615-37/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Editor icons" Closes #38597 See merge request gitlab-org/gitlab-ce!15169
| * | | | | | Resolve "Editor icons"Tim Zallmann2017-11-0615-37/+58
|/ / / / / /
* | | | | | Merge branch 'docs/add-link-to-brand-ai' into 'master'Achilleas Pipinellis2017-11-061-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to GitLab brand.ai page in docs See merge request gitlab-org/gitlab-ce!15161
| * | | | | | Add link to GitLab brand.ai pagedocs/add-link-to-brand-aiEric Eastwood2017-11-021-1/+5
| | | | | | |
* | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-11-0615-1346/+5585
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of EE-translations Closes #39377 See merge request gitlab-org/gitlab-ce!15205
| * | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-11-0615-1346/+5585
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Crowdin translations Closes gitlab-ce#39377 See merge request gitlab-org/gitlab-ee!3179
* | | | | | | Merge branch 'expose-job-duration' into 'master'Rémy Coutable2017-11-063-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose `duration` in Job API entity Closes #35794 See merge request gitlab-org/gitlab-ce!13644
| * | | | | | | Expose `duration` in Job API entityMehdi Lahmam2017-11-053-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35794.
* | | | | | | | Merge branch 'jej/fix-lfs-changes-laziness' into 'master'Douwe Maan2017-11-066-46/+108
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement lazy popen so LfsChanges doesn't have to wait for rev-list to complete See merge request gitlab-org/gitlab-ce!15180
| * | | | | | | | Gitlab::Git::RevList and LfsChanges use lazy popenjej/fix-lfs-changes-lazinessJames Edwards-Jones2017-11-064-44/+84
| | | | | | | | |
| * | | | | | | | Gitlab::Git::Popen can lazily hand output to a blockJames Edwards-Jones2017-11-062-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows input to start processing immediately without waiting for the process to complete. This also allows long or infinite inputs to be partially processed, which will termiate the process when reading stops with SIGPIPE.
* | | | | | | | | Merge branch 'ce-gitlab-git-backport' into 'master'Sean McGivern2017-11-0611-80/+228
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | CE repository mirroring changes backport See merge request gitlab-org/gitlab-ce!15184
| * | | | | | | | Use Gitlab::Git operations for repository mirroringce-gitlab-git-backportAlejandro Rodríguez2017-11-032-33/+0
| | | | | | | | |
| * | | | | | | | Encapsulate git operations for mirroring in Gitlab::GitAlejandro Rodríguez2017-11-038-43/+188
| | | | | | | | |
| * | | | | | | | Create a Wiki Repository's raw_repository properlyAlejandro Rodríguez2017-11-033-4/+25
| | | | | | | | |
| * | | | | | | | Add `Gitlab::Git::Repository#fetch` commandAlejandro Rodríguez2017-11-031-0/+15
| | | | | | | | |
* | | | | | | | | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-065-3/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added discussion_line_code value to note response and use it to query the right… Closes #38677 See merge request gitlab-org/gitlab-ce!14981
| * | | | | | | | | Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| | | | | | | | | |
| * | | | | | | | | Added changelogLuke "Jared" Bennett2017-10-301-0/+5
| | | | | | | | | |
| * | | | | | | | | FE review changes - remove internal details assertion and look for closest ↵Luke "Jared" Bennett2017-10-272-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | form if no discussion_line_code
| * | | | | | | | | Add spec for root diff discussion noteLuke "Jared" Bennett2017-10-241-2/+22
| | | | | | | | | |
| * | | | | | | | | Fix karmaLuke "Jared" Bennett2017-10-232-1/+2
| | | | | | | | | |
| * | | | | | | | | Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| | | | | | | | | |
| * | | | | | | | | Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-212-1/+7
| | | | | | | | | |
| * | | | | | | | | Added discussion_line_code value to note response and use it to query the ↵Luke "Jared" Bennett2017-10-212-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right row for the discussion UI
* | | | | | | | | | Merge branch ↵Kamil Trzciński2017-11-062-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failures' into 'master' Remove unique validation from external_url in Environment Closes #37299 See merge request gitlab-org/gitlab-ce!15202
| * | | | | | | | | | Remove unique validation from external_url in Environmentfix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failuresShinya Maeda2017-11-062-2/+0
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/sm/39817-fix-cron_parser_spec-rb' into 'master'Rémy Coutable2017-11-061-6/+42
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cron_parser_spec.rb (`master` branch failure on Nov 5th) Closes #39817 See merge request gitlab-org/gitlab-ce!15196
| * | | | | | | | | Add TimeCop freeze for DST and Regular timefix/sm/39817-fix-cron_parser_spec-rbShinya Maeda2017-11-051-6/+42
|/ / / / / / / / /
* | | | | | | | | Merge branch '37473-expose-project-visibility-as-ci-variable' into 'master'Kamil Trzciński2017-11-054-1/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Expose project visibility as CI variable" Closes #37473 See merge request gitlab-org/gitlab-ce!15193
| * | | | | | | | | Harcode project visibility37473-expose-project-visibility-as-ci-variableMatija Čupić2017-11-051-1/+1
| | | | | | | | | |
| * | | | | | | | | Expose project visibility as CI variableMatija Čupić2017-11-044-1/+9
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix_migration_that_adds_ff_merge_field' into 'master'Stan Hu2017-11-042-1/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a migration that adds merge_requests_ff_only_enabled column to MR table Closes #39382 and #39357 See merge request gitlab-org/gitlab-ce!15195