summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Avoid error when no restricted levels are definedbvl-fix-500-on-fork-without-restricted-visibility-levelsBob Van Landuyt2018-02-023-1/+15
| | | | | | When no visibility levels are defined they could sometimes return `nil` instead of an empty array. In this case we want to allow all levels.
* Merge branch 'fl-mr-widget-1' into 'master'Phil Hughes2018-02-029-268/+418
|\ | | | | | | | | Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16857
| * Fixes after reviewfl-mr-widget-1Filipa Lacerda2018-02-012-12/+18
| |
| * Merge branch 'master' into fl-mr-widget-1Filipa Lacerda2018-02-01181-835/+1830
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits) Added more tests and corrected typos Ban Rugged from Repository Improve doc/development/automatic_ce_ee_merge.md fixed infinite loop crashing tests Converted todos.js to axios Converted usage_ping.js to use axios Converted pager.js to axios Converted notifications_form.js to axios Converted notes.js to axios Converted branch_graph.js to axios Converted mini_pipeline_graph_dropdown.js to axios Include subgroup issuables on the group page Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock Replace $.ajax in find file with axios Replace $.ajax in activity calendar with axios Remove namespaced internationalization import Fix subgroup creation docs Fix a JSON schema that doesn't include enough fields Make user/author use project.creator in most factories Enable RuboCop Style/RegexpLiteral ...
| * | Transform `a` tag with button role into a `button`Filipa Lacerda2018-02-012-9/+11
| | |
| * | Update spec to match link being changed into a buttonFilipa Lacerda2018-02-011-1/+1
| | |
| * | Moves widget header into a vue fileFilipa Lacerda2018-02-016-212/+351
| | |
| * | Moves merge help into a vue componentFilipa Lacerda2018-01-315-60/+63
| | |
* | | Merge branch 'fl-mr-widget-2' into 'master'Phil Hughes2018-02-029-137/+136
|\ \ \ | | | | | | | | | | | | | | | | Moves author components into vue files See merge request gitlab-org/gitlab-ce!16863
| * | | Moves more mr widget components into vue filesfl-mr-widget-2Filipa Lacerda2018-02-019-137/+136
| | |/ | |/|
* | | Merge branch 'patch-28' into 'master'Dmitriy Zaporozhets2018-02-021-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix typo in gitlab_runner_chart.md See merge request gitlab-org/gitlab-ce!16860
| * | | Fix typo in gitlab_runner_chart.mdAlexandre Figura2018-02-011-2/+2
| | | | | | | | | | | | When Gitlab URL is set as `gitlabURL` in the configuration file, `helm install` is not happy and complains about a missing `gitlabUrl`.
* | | | Merge branch 'issues-closed-at-steal' into 'master'Sean McGivern2018-02-023-1/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finish any remaining jobs for issues.closed_at Closes #41595 See merge request gitlab-org/gitlab-ce!16858
| * | | | Finish any remaining jobs for issues.closed_atissues-closed-at-stealYorick Peterse2018-02-013-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the event of Sidekiq jobs getting lost there may be some rows left to migrate. This migration ensures any remaining jobs are completed and that all data has been migrated. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/41595
* | | | | Merge branch 'fix/improve-issue-note-dropdown' into 'master'Phil Hughes2018-02-023-3/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve issue note dropdown and mr button See merge request gitlab-org/gitlab-ce!16758
| * | | | | Improve issue mr and branch dropdown buttonGeorge Tsiolis2018-01-293-3/+7
| | | | | |
* | | | | | Merge branch 'qa-173' into 'master'Grzegorz Bizon2018-02-012-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA::Page::Component::Dropzone#initialize needs a QA::Page::Base object See merge request gitlab-org/gitlab-ce!16852
| * | | | | | QA::Page::Component::Dropzone#initialize needs a QA::Page::Base objectqa-173Rémy Coutable2018-02-012-1/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'qa-absolute-path-to-screenshots' into 'master'Grzegorz Bizon2018-02-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we save QA screenshots to an absolute path See merge request gitlab-org/gitlab-ce!16845
| * | | | | | Ensure we save QA screenshots to an absolute pathqa-absolute-path-to-screenshotsRémy Coutable2018-02-011-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to open the file address printed in the terminal, otherwise the address started with `tmp` which was relatove to the `qa/` dir. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master'Robert Speicher2018-02-012-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes in the application settings helper to CE See merge request gitlab-org/gitlab-ce!16801
| * | | | | | Refactor repository_storages_options_for_selectNick Thomas2018-01-312-3/+4
| | | | | | |
* | | | | | | Merge branch 'add-confirmation-input-for-modals' into 'master'Clement Ho2018-02-013-0/+130
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confirmation input component See merge request gitlab-org/gitlab-ce!16816
| * | | | | | | Add confirmation input componentJose Ivan Vargas2018-02-013-0/+130
| | | | | | | |
* | | | | | | | Merge branch 'docs-rename-products-new-policy' into 'master'🚄 Job van der Voort 🚀2018-02-011-22/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update GitLab products description See merge request gitlab-org/gitlab-ce!16862
| * | | | | | | | Docs: update GitLab products descriptionMarcia Ramos2018-02-011-22/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'gitaly-970-repo-write-config' into 'master'Robert Speicher2018-02-015-2/+66
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#write_config to Gitaly Closes gitaly#970 See merge request gitlab-org/gitlab-ce!16730
| * | | | | | | | Migrate Gitlab::Git::Repository#write_config to Gitalygitaly-970-repo-write-configKim "BKC" Carlbäcker2018-01-315-2/+66
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | - Add tests for Repository#write_config
* | | | | | | | Merge branch '35285-user-interface-bugs-for-schedule-pipelines' into 'master'Rémy Coutable2018-02-015-1/+76
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide pipeline schedule 'take ownership' for current owner Closes #35285 See merge request gitlab-org/gitlab-ce!12986
| * | | | | | | | Hide pipeline schedule 'take ownership' for current ownerMark Fletcher2018-02-015-1/+76
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rc/speedup-gitlab_git_test' into 'master'Robert Speicher2018-02-011-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Speed-up the gitlab_git_test job See merge request gitlab-org/gitlab-ce!16861
| * | | | | | | Speed-up the gitlab_git_test jobRémy Coutable2018-02-011-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'ph-axios-3' into 'master'Filipa Lacerda2018-02-019-151/+207
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | More conversions to axios See merge request gitlab-org/gitlab-ce!16848
| * | | | | | fixed infinite loop crashing testsph-axios-3Phil Hughes2018-02-011-8/+13
| | | | | | |
| * | | | | | Converted todos.js to axiosPhil Hughes2018-02-011-22/+15
| | | | | | |
| * | | | | | Converted usage_ping.js to use axiosPhil Hughes2018-02-011-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also removed dependancy on jQuery because it is super simple & not required
| * | | | | | Converted pager.js to axiosPhil Hughes2018-02-012-32/+77
| | | | | | |
| * | | | | | Converted notifications_form.js to axiosPhil Hughes2018-02-011-19/+19
| | | | | | |
| * | | | | | Converted notes.js to axiosPhil Hughes2018-02-011-20/+15
| | | | | | |
| * | | | | | Converted branch_graph.js to axiosPhil Hughes2018-02-011-8/+8
| | | | | | |
| * | | | | | Converted mini_pipeline_graph_dropdown.js to axiosPhil Hughes2018-02-012-41/+58
| | | | | | |
* | | | | | | Merge branch 'ban-rugged-app-models' into 'master'Rémy Coutable2018-02-011-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ban Rugged from Repository See merge request gitlab-org/gitlab-ce!16855
| * | | | | | | Ban Rugged from Repositoryban-rugged-app-modelsJacob Vosmaer2018-02-011-4/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into ↵Filipa Lacerda2018-02-017-0/+280
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Realtime update of pipeline status in Files view Closes #35779 See merge request gitlab-org/gitlab-ce!16523
| * | | | | | | Added more tests and corrected typos35779-realtime-update-of-pipeline-status-in-files-viewJose Ivan Vargas2018-02-018-82/+131
| | | | | | | |
| * | | | | | | Restored some code, add hidden classJose Ivan Vargas2018-01-304-19/+23
| | | | | | | |
| * | | | | | | Added realtime prop and corrected specsJose Ivan Vargas2018-01-307-7/+44
| | | | | | | |
| * | | | | | | Added changelogJose Ivan Vargas2018-01-301-0/+5
| | | | | | | |
| * | | | | | | Added pipeline status to the files viewJose Ivan Vargas2018-01-307-17/+202
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '36009-user-default-project-creator-in-factories' into 'master'Robert Speicher2018-02-0124-33/+46
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make user/author use project.creator in most factories Closes #36009 See merge request gitlab-org/gitlab-ce!13321
View Lorry Controller Status