summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix Gitlab::CurrentSettings specs37698-current-settingsMario de la Ossa2018-02-023-6/+10
* turn Gitlab::CurrentSettings into a class to avoid accidental inclusionMario de la Ossa2018-02-011-57/+57
* use Gitlab::UserSettings directly instead of including/extending itMario de la Ossa2018-02-0195-270/+189
* Merge branch 'qa-173' into 'master'Grzegorz Bizon2018-02-012-1/+3
|\
| * QA::Page::Component::Dropzone#initialize needs a QA::Page::Base objectqa-173Rémy Coutable2018-02-012-1/+3
* | Merge branch 'qa-absolute-path-to-screenshots' into 'master'Grzegorz Bizon2018-02-011-1/+1
|\ \
| * | Ensure we save QA screenshots to an absolute pathqa-absolute-path-to-screenshotsRémy Coutable2018-02-011-1/+1
| |/
* | Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master'Robert Speicher2018-02-012-3/+4
|\ \
| * | 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 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 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 Gitalygitaly-970-repo-write-configKim "BKC" Carlbäcker2018-01-315-2/+66
| | |/ / | |/| |
* | | | 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 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 jobRémy Coutable2018-02-011-1/+2
|/ / / /
* | | | Merge branch 'ph-axios-3' into 'master'Filipa Lacerda2018-02-019-151/+207
|\ \ \ \
| * | | | 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
| * | | | 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 Repositoryban-rugged-app-modelsJacob Vosmaer2018-02-011-4/+1
| | |/ / / | |/| | |
* | | | | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into 'm...Filipa Lacerda2018-02-017-0/+280
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix a JSON schema that doesn't include enough fieldsRémy Coutable2018-01-311-0/+4
| * | | | Make user/author use project.creator in most factoriesRémy Coutable2018-01-3123-33/+42
* | | | | Merge branch 'jramsay-42598-fix-subgroup-creation-docs' into 'master'Marcia Ramos2018-02-012-1/+2
|\ \ \ \ \
| * | | | | Fix subgroup creation docsjramsay-42598-fix-subgroup-creation-docsJames Ramsay2018-01-312-1/+2
* | | | | | Merge branch '41710-improve-automatic-ce-ee-merge-docs' into 'master'Sean McGivern2018-02-011-8/+23
|\ \ \ \ \ \
| * | | | | | Improve doc/development/automatic_ce_ee_merge.mdRémy Coutable2018-02-011-8/+23
|/ / / / / /
* | | | | | Merge branch '30106-group-issues' into 'master'Sean McGivern2018-02-018-51/+200
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Include subgroup issuables on the group page30106-group-issuesJarka Kadlecová2018-02-018-51/+200
* | | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-0184-149/+156
|\ \ \ \ \ \
| * | | | | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-0184-149/+156
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-internationalization-namespace' into 'master'Filipa Lacerda2018-02-011-2/+2
|\ \ \ \ \ \
| * | | | | | Remove namespaced internationalization importfix-internationalization-namespaceClement Ho2018-01-311-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sh-remove-universal-darwin'Stan Hu2018-01-311-2/+2
|\ \ \ \ \ \
View Lorry Controller Status