summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* add manage button to application rows in cluster integrationMike Greiling2018-01-302-5/+28
* Fix rubocopPawel Chojnacki2018-01-301-0/+1
* fix service generic testsPawel Chojnacki2018-01-301-4/+1
* Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-29309-1791/+2843
|\
| * 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
| |\ \ \ \ \ \
| | * | | | | | Disable MR check out button when source branch is deletedJacopo2018-01-291-0/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Fix MR revert check when no merged_at is presentSean McGivern2018-01-291-6/+6
| |/ / / / /
| * | | | | normalize headers correctlyPhil Hughes2018-01-293-13/+5
| * | | | | fixed dashboard projects not being filterablePhil Hughes2018-01-291-1/+1
| * | | | | Converted filterable_list to axiosPhil Hughes2018-01-292-25/+20
| * | | | | Converted due_date_select to axiosPhil Hughes2018-01-291-27/+21
| * | | | | Converted dropzone_input to axiosPhil Hughes2018-01-291-18/+15
| * | | | | Converted create_merge_request_dropdown to axiosPhil Hughes2018-01-291-80/+67
| * | | | | converted compare_autocomplete to axiosPhil Hughes2018-01-291-7/+8
| * | | | | Convered compare.js to axiosPhil Hughes2018-01-291-26/+21
| | |/ / / | |/| | |
| * | | | Merge branch 'generalize-js-toggle-buttons' into 'master'Filipa Lacerda2018-01-265-69/+84
| |\ \ \ \
| | * | | | Generalize toggle_buttons.jsgeneralize-js-toggle-buttonsEric Eastwood2018-01-265-69/+84
| * | | | | Fix #42486.Connor Shea2018-01-261-8/+9
| | |_|_|/ | |/| | |
| * | | | update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-264-3/+7
| * | | | add specJames Lopez2018-01-262-1/+1
| * | | | disable retry attempts for Import/Export until that is fixedJames Lopez2018-01-262-1/+12
| * | | | fix validation error on servicesJames Lopez2018-01-264-3/+5
| | |_|/ | |/| |
| * | | Merge branch 'fl-mr-widget-components' into 'master'Phil Hughes2018-01-265-204/+254
| |\ \ \
| | * | | Adds missing i18nFilipa Lacerda2018-01-261-2/+2
| | * | | Merge branch 'master' into fl-mr-widget-componentsFilipa Lacerda2018-01-2515-112/+70
| | |\ \ \
| | * | | | Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-255-204/+254
| * | | | | Merge branch 'winh-check-axios-restore' into 'master'Filipa Lacerda2018-01-261-0/+8
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Make sure that axios adapater is restored after mockingwinh-check-axios-restoreWinnie Hellmann2018-01-251-0/+8
| * | | | | Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-261-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | fix bug in webpack_helper in which force_same_domain argument was ignored bre...fix-local-rspec-testsMike Greiling2018-01-251-1/+1
| * | | | | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-251-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-241-1/+1
| * | | | | Merge branch 'katex-throwOnError' into 'master'Filipa Lacerda2018-01-251-1/+1
| |\ \ \ \ \
| | * | | | | Disable throwOnError in KaTeX to reveal user where is the problemJakub Jirutka2018-01-241-1/+1
| | |/ / / /
| * | | | | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-253-13/+3
| |\ \ \ \ \
| | * | | | | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-253-13/+3