summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cal-label-fix' into 'master'Annabel Dunstone Gray2018-01-301-1/+1
|\
| * Contribution calendar label cutoff fixcal-label-fixClement Ho2018-01-291-1/+1
* | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-302-1/+10
|\ \
| * | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-302-1/+10
| |/
* | Merge branch 'gitaly-784-repo-write-ref' into 'master'Douwe Maan2018-01-301-0/+2
|\ \
| * | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-301-0/+2
* | | Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-01-301-0/+2
|\ \ \
| * | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-301-0/+2
* | | | Decouple more of Repository from RuggedJacob Vosmaer (GitLab)2018-01-301-62/+5
* | | | Merge branch 'jprovazn-pagination' into 'master'Sean McGivern2018-01-301-5/+15
|\ \ \ \
| * | | | Make pagination optional for issuablesJan Provaznik2018-01-301-5/+15
* | | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-302-3/+14
|\ \ \ \ \
| * | | | | Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-292-3/+14
* | | | | | Merge branch 'rc/port-ee-4064' into 'master'Rémy Coutable2018-01-301-1/+1
|\ \ \ \ \ \
| * | | | | | Port changes from gitlab-org/gitlab-ee!4064 to CERémy Coutable2018-01-301-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ph-ajax-into-axios' into 'master'Filipa Lacerda2018-01-306-89/+80
|\ \ \ \ \ \
| * | | | | | cache jQuery selectorph-ajax-into-axiosPhil Hughes2018-01-301-5/+7
| * | | | | | Converted integration_settings_form to axiosPhil Hughes2018-01-291-25/+23
| * | | | | | 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-301-13/+31
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add createNewItemFromValue option and clearDropdown methodupdate-create-item-dropdown-with-create-new-item-optionEric Eastwood2018-01-301-13/+31
* | | | | | | Replace $.get in single file diff with axiosClement Ho2018-01-301-11/+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 '41802-add-space-to-edit-delete-tag-btns' into 'master'Filipa Lacerda2018-01-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds spacing between edit and delete btn in tag listJacopo2018-01-281-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-prometheus-empty-state-no-data' into 'master'Phil Hughes2018-01-302-3/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | add noData empty state to prometheus graphsfix-prometheus-empty-state-no-dataMike Greiling2018-01-292-3/+16
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Fix JIRA not working when a trailing slash is includedStan Hu2018-01-291-1/+1
|/ / / / / / /
* | | | | | | Replace $.post in edit blob with axiosClement Ho2018-01-291-5/+10
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-291-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-cache-clear-windowsfix-cache-clear-windowsMatija Čupić2018-01-276-77/+93
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Replace : with _ in cache key versioningMatija Čupić2018-01-261-1/+1
* | | | | | | Close and do not reload MR diffs when source branch is deletedOswaldo Ferreira2018-01-291-2/+14
* | | | | | | Merge branch 'fl-vue-mr-widget' into 'master'Phil Hughes2018-01-293-140/+193
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
| * | | | | | [ci skip] Merge branch 'master' into fl-vue-mr-widgetFilipa Lacerda2018-01-2919-270/+264
| |\ \ \ \ \ \
| * | | | | | | Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-263-140/+193
* | | | | | | | Merge branch 'nogravatar-fix-default-avatar' into 'master'Fatih Acet2018-01-293-6/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fall back to default_avatar_url in issue assigment.Felix Geyer2018-01-282-5/+3
| * | | | | | | | Make default_avatar return a full path.Felix Geyer2018-01-281-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'qa_78_create_merge_request' into 'master'Grzegorz Bizon2018-01-294-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Create merge request specqa_78_create_merge_requestFelipe Artur2018-01-264-4/+4
* | | | | | | | | Replace $.post in awards handler with axiosClement Ho2018-01-291-4/+8
* | | | | | | | | Merge branch '42255-disable-mr-checkout-button-when-source-branch-deleted' in...Fatih Acet2018-01-291-0/+1
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status