Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix environments testsremove-common-vue | Mike Greiling | 2018-03-06 | 1 | -6/+7 |
| | |||||
* | remove locale bundle | Mike Greiling | 2018-03-06 | 1 | -1/+0 |
| | |||||
* | remove common_vue webpack bundle | Mike Greiling | 2018-03-06 | 11 | -24/+1 |
| | |||||
* | Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master' | Robert Speicher | 2018-03-05 | 12 | -33/+143 |
|\ | | | | | | | | | Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342 | ||||
| * | CI/CD-only projects FE | Eric Eastwood | 2018-03-05 | 12 | -31/+137 |
| | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot | ||||
| * | Backport BE changes from CI/CD projects ee!4567 | Eric Eastwood | 2018-03-02 | 1 | -2/+6 |
| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567 | ||||
* | | Merge branch 'sh-fix-issue-43871-system-hooks' into 'master' | Robert Speicher | 2018-03-05 | 3 | -2/+15 |
|\ \ | | | | | | | | | | | | | | | | | | | Don't error out in system hook if user has `nil` datetime columns Closes #43871 See merge request gitlab-org/gitlab-ce!17543 | ||||
| * | | Don't error out in system hook if user has `nil` datetime columns | Stan Hu | 2018-03-05 | 3 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | | Deleting a user would fail in the system hooks if the user had `nil` column in `datetime` or `updated_at` fields. Closes #43871 | ||||
* | | | Merge branch 'feature/oauth_generic_provider' into 'master' | Douwe Maan | 2018-03-05 | 8 | -20/+86 |
|\ \ \ | | | | | | | | | | | | | | | | | Make oauth provider login generic See merge request gitlab-org/gitlab-ce!8809 | ||||
| * | | | Make oauth provider login generic | Horatiu Eugen Vlad | 2018-03-05 | 8 | -20/+86 |
|/ / / | |||||
* | | | Merge branch 'sh-cleanup-after-git-gc' into 'master' | Robert Speicher | 2018-03-05 | 3 | -0/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | Release libgit2 cache and open file descriptors after `git gc` run See merge request gitlab-org/gitlab-ce!17506 | ||||
| * | | | Release libgit2 cache and open file descriptors after `git gc` runsh-cleanup-after-git-gc | Stan Hu | 2018-03-03 | 3 | -0/+15 |
| |/ / | | | | | | | | | | Relates to #21879 | ||||
* | | | Merge branch 'issue_31081' into 'master' | Douwe Maan | 2018-03-05 | 4 | -6/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use host URL to build JIRA remote link icon Closes #31081 See merge request gitlab-org/gitlab-ce!17541 | ||||
| * | | | Use host URL to build JIRA remote link icon | Felipe Artur | 2018-03-05 | 4 | -6/+14 |
| | | | | |||||
* | | | | Merge branch '43829-update-ssh-addtion-text' into 'master' | Douwe Maan | 2018-03-05 | 2 | -1/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "SSH key add text" Closes #43829 See merge request gitlab-org/gitlab-ce!17527 | ||||
| * | | | | Resolve "SSH key add text" | Brendan O'Leary 🐢 | 2018-03-05 | 2 | -1/+8 |
|/ / / / | |||||
* | | | | Merge branch 'dz-use-less-deprecated-methods' into 'master' | Douwe Maan | 2018-03-05 | 80 | -142/+146 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523 | ||||
| * | | | Revert few more broken specs related to *_with_namespace methodsdz-use-less-deprecated-methods | Dmitriy Zaporozhets | 2018-03-05 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Revert js changes to name_with_namespace | Dmitriy Zaporozhets | 2018-03-05 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Update workers spec to use full_path instead of path_with_namespace | Dmitriy Zaporozhets | 2018-03-05 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Replace deprecated name_with_namespace with full_name in app and spec | Dmitriy Zaporozhets | 2018-03-05 | 42 | -83/+83 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Replace deprecated name_with_namespace with full_name in app/views | Dmitriy Zaporozhets | 2018-03-05 | 28 | -35/+35 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Replace deprecated path_with_namespace with full_path | Dmitriy Zaporozhets | 2018-03-05 | 8 | -23/+27 |
| |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'fj-41174-projects-groups-badges-api' into 'master' | Douwe Maan | 2018-03-05 | 43 | -549/+1793 |
|\ \ \ | | | | | | | | | | | | | | | | | Projects and groups badges API See merge request gitlab-org/gitlab-ce!17082 | ||||
| * | | | Projects and groups badges API | Francisco Javier López | 2018-03-05 | 43 | -549/+1793 |
|/ / / | |||||
* | | | Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-ui | Robert Speicher | 2018-03-05 | 9 | -7/+18 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup after adding MR diff's commit_count Closes #41698 See merge request gitlab-org/gitlab-ce!17513 | ||||
| * | | | Cleanup after adding MR diff's commit_count | Jan Provaznik | 2018-03-05 | 9 | -7/+18 |
| |/ / | | | | | | | | | | | | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method | ||||
* | | | Merge branch 'fix-impersonate-ui' into 'master' | Rémy Coutable | 2018-03-05 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove impersonate token from flash scope in UI See merge request gitlab-org/gitlab-ce!17480 | ||||
| * | | | Remove impersonate token from flash scope | julien MILLAU | 2018-03-02 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'fix/find-commit-with-empty-rev' into 'master' | Robert Speicher | 2018-03-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep note commit around if commit_id is present Closes gitaly#1054 See merge request gitlab-org/gitlab-ce!17496 | ||||
| * | | | | Keep a commit around if its sha is present | Ahmad Sherif | 2018-03-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Closes gitaly#1054 | ||||
* | | | | | Merge branch 'kp-label-select-vue' into 'master' | Phil Hughes | 2018-03-05 | 32 | -10/+1231 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Port Labels Select dropdown to Vue See merge request gitlab-org/gitlab-ce!17411 | ||||
| * | | | | | Add changelog entrykp-label-select-vue | Kushal Pandya | 2018-03-05 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownValueCollapsed Component | Kushal Pandya | 2018-03-05 | 2 | -0/+122 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownValue Component | Kushal Pandya | 2018-03-05 | 2 | -0/+157 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownTitle Component | Kushal Pandya | 2018-03-05 | 2 | -0/+72 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownSearchInput Component | Kushal Pandya | 2018-03-05 | 2 | -0/+66 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownHiddenInput Component | Kushal Pandya | 2018-03-05 | 2 | -0/+59 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownHeader Component | Kushal Pandya | 2018-03-05 | 2 | -0/+57 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownFooter Component | Kushal Pandya | 2018-03-05 | 2 | -0/+76 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownCreateLabel Component | Kushal Pandya | 2018-03-05 | 2 | -0/+168 |
| | | | | | | |||||
| * | | | | | LabelsSelect DropdownButton Component | Kushal Pandya | 2018-03-05 | 2 | -0/+160 |
| | | | | | | |||||
| * | | | | | LabelsSelect Base Component | Kushal Pandya | 2018-03-05 | 2 | -0/+230 |
| | | | | | | |||||
| * | | | | | LabelsSelectComponent tests mock data | Kushal Pandya | 2018-03-05 | 1 | -0/+49 |
| | | | | | | |||||
| * | | | | | Update path for ListLabel model | Kushal Pandya | 2018-03-05 | 7 | -7/+7 |
| | | | | | | |||||
| * | | | | | ListLabel Shared Model | Kushal Pandya | 2018-03-05 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Add `suggest_colors` from LabelsHelper | Kushal Pandya | 2018-03-05 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Allow exposing methods to `gon_helper` | Kushal Pandya | 2018-03-05 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch '42572-release-controller' into 'master' | Robert Speicher | 2018-03-05 | 7 | -82/+145 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Try not to hold env and release the controller after the request. See merge request gitlab-org/gitlab-ce!16847 | ||||
| * | | | | | Move constants and update for feedback42572-release-controller | Lin Jen-Shin | 2018-03-03 | 4 | -18/+15 |
| | | | | | |