summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-307-38/+59
* Merge branch 'cal-label-fix' into 'master'Annabel Dunstone Gray2018-01-302-1/+6
|\
| * Contribution calendar label cutoff fixcal-label-fixClement Ho2018-01-292-1/+6
* | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-308-10/+55
|\ \
| * | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-308-10/+55
| |/
* | Merge branch 'rc/ignore-schema-in-ee_compat_check' into 'master'Robert Speicher2018-01-301-1/+1
|\ \
| * | Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheckrc/ignore-schema-in-ee_compat_checkRémy Coutable2018-01-301-1/+1
* | | Merge branch '42591-update-nokogiri' into 'master'Stan Hu2018-01-303-3/+8
|\ \ \
| * | | Update Nokogiri to 1.8.2Rémy Coutable2018-01-303-3/+8
| |/ /
* | | Merge branch 'gitaly-784-repo-write-ref' into 'master'Douwe Maan2018-01-303-4/+34
|\ \ \
| * | | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-303-4/+34
* | | | Merge branch '21554-mark-new-user-as-external' into 'master'Douwe Maan2018-01-303-10/+27
|\ \ \ \
| * | | | Only new users get marked as external21554-mark-new-user-as-externalTiago Botelho2018-01-303-10/+27
* | | | | Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-01-303-0/+17
|\ \ \ \ \
| * | | | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-303-0/+17
* | | | | | Merge branch 'qa-speedup-new-subgroup-click' into 'master'Grzegorz Bizon2018-01-301-1/+9
|\ \ \ \ \ \
| * | | | | | Speed-up the click on 'New subgroup' if the 'No results' text is shownqa-speedup-new-subgroup-clickRémy Coutable2018-01-301-1/+9
* | | | | | | Merge branch 'qa-define-selectors' into 'master'Grzegorz Bizon2018-01-303-28/+23
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'master' into 'qa-define-selectors'qa-define-selectorsLin Jen-Shin2018-01-3086-661/+1351
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Define selectors and remove EE only codeLin Jen-Shin2018-01-293-34/+42
* | | | | | | Merge branch 'ban-rugged-from-repository' into 'master'Sean McGivern2018-01-306-82/+107
|\ \ \ \ \ \ \
| * | | | | | | Decouple more of Repository from RuggedJacob Vosmaer (GitLab)2018-01-306-82/+107
|/ / / / / / /
* | | | | | | Merge branch 'jprovazn-pagination' into 'master'Sean McGivern2018-01-302-5/+27
|\ \ \ \ \ \ \
| * | | | | | | Make pagination optional for issuablesJan Provaznik2018-01-302-5/+27
* | | | | | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-304-3/+23
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-294-3/+23
* | | | | | | | Merge branch 'rc/port-ee-4064' into 'master'Rémy Coutable2018-01-3011-7/+190
|\ \ \ \ \ \ \ \
| * | | | | | | | Port changes from gitlab-org/gitlab-ee!4064 to CERémy Coutable2018-01-3011-7/+190
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '42569-lint-changelog-yaml-script-is-run-twice-in-ci' into 'master'Grzegorz Bizon2018-01-301-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in ...42569-lint-changelog-yaml-script-is-run-twice-in-ciRémy Coutable2018-01-301-1/+0
* | | | | | | | | Merge branch 'ph-ajax-into-axios' into 'master'Filipa Lacerda2018-01-308-143/+180
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cache jQuery selectorph-ajax-into-axiosPhil Hughes2018-01-301-5/+7
| * | | | | | | | | fixed issuable_spec.jsPhil Hughes2018-01-291-4/+22
| * | | | | | | | | Converted integration_settings_form to axiosPhil Hughes2018-01-292-75/+101
| * | | | | | | | | Converted issuable_bulk_update_actions to axiosPhil Hughes2018-01-291-9/+4
| * | | | | | | | | Converted issuable_index to axiosPhil Hughes2018-01-291-13/+15
| * | | | | | | | | Converted group_label_subscription to axiosPhil Hughes2018-01-291-14/+13
| * | | | | | | | | Converted graphs_show to axiosPhil Hughes2018-01-291-7/+9
| * | | | | | | | | Converted gl_dropdown to axiosPhil Hughes2018-01-291-19/+12
* | | | | | | | | | Merge branch 'update-create-item-dropdown-with-create-new-item-option' into '...Filipa Lacerda2018-01-302-44/+139
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add createNewItemFromValue option and clearDropdown methodupdate-create-item-dropdown-with-create-new-item-optionEric Eastwood2018-01-302-44/+139
* | | | | | | | | | Merge branch 'axios-get-single-file-diff' into 'master'Filipa Lacerda2018-01-302-18/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace $.get in single file diff with axiosClement Ho2018-01-302-18/+15
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'axios-post-label-manager' into 'master'Fatih Acet2018-01-301-18/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary returnaxios-post-label-managerClement Ho2018-01-241-1/+1
| * | | | | | | | | | Replace $.post in label manager with axiosClement Ho2018-01-241-18/+14
* | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-01-301-11/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: Correct example responses in repository_files.mdkasbah2018-01-271-11/+2
* | | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-01-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update index.mdMuhamed2018-01-261-1/+1