summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add CI job trace default location to docsdocs/add-ci-trace-to-settings-and-configsCindy Pallares 🦉2018-02-091-0/+17
* Merge branch '37698-current-settings' into 'master'Sean McGivern2018-02-0296-324/+247
|\
| * use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-0296-324/+247
|/
* Merge branch 'ph-axios-2' into 'master'Filipa Lacerda2018-02-0219-588/+719
|\
| * added missing calls in catch statementsph-axios-2Phil Hughes2018-02-022-3/+10
| * fixed issue with axios_utils not reducing activeVueResources variable when re...Phil Hughes2018-02-022-1/+16
| * Merge branch 'master' into ph-axios-2Phil Hughes2018-02-01112-442/+561
| |\
| * | fixed axios mock not being restoredPhil Hughes2018-02-011-0/+4
| * | remove useless ajaxPost methodPhil Hughes2018-02-013-21/+6
| * | fixed notes_spec.jsPhil Hughes2018-02-011-58/+124
| * | fixed issue_spec transient failurePhil Hughes2018-01-311-32/+27
| * | fixed eslint :see_no_evil:Phil Hughes2018-01-312-2/+0
| * | Merge branch 'master' into ph-axios-2Phil Hughes2018-01-31124-1309/+2600
| |\ \
| * | | fixed eslintPhil Hughes2018-01-311-2/+1
| * | | Converted common_utils to axiosPhil Hughes2018-01-313-17/+19
| * | | Converted ajax_cache to axiosPhil Hughes2018-01-312-60/+41
| * | | Converted milestone_select.js to axiosPhil Hughes2018-01-311-61/+58
| * | | Converted milestone.js to axiosPhil Hughes2018-01-311-10/+8
| * | | fixed failing specsPhil Hughes2018-01-316-34/+43
| * | | Converted merge_request_tabs.js to axiosPhil Hughes2018-01-302-51/+84
| * | | Convert merge_conflict_service.js to axiosPhil Hughes2018-01-302-21/+11
| * | | Converted labels_select.js to axiosPhil Hughes2018-01-301-85/+85
| * | | Converted job.js to axiosPhil Hughes2018-01-302-131/+144
| * | | Converted issue.js to axiosPhil Hughes2018-01-302-46/+76
* | | | Merge branch 'fix/adjust-button-group-width-on-mobile' into 'master'Clement Ho2018-02-0214-24/+35
|\ \ \ \
| * | | | Improve top area navigationGeorge Tsiolis2018-02-0214-24/+35
* | | | | Merge branch '40793-fix-mr-title-for-jira' into 'master'Sean McGivern2018-02-023-12/+81
|\ \ \ \ \
| * | | | | Resolve "Incorrect merge request title when Jira activated and multiple commi...Andrew McCallum2018-02-023-12/+81
* | | | | | Merge branch 'osw-system-notes-for-commits-regression' into 'master'Sean McGivern2018-02-023-32/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix and improve stubbed test for WIP commit refOswaldo Ferreira2018-02-021-31/+15
| * | | | | Reload MRs memoization after diffs creationosw-system-notes-for-commits-regressionOswaldo Ferreira2018-02-013-1/+19
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mr-widget-author-component-backport' into 'master'Filipa Lacerda2018-02-021-1/+21
|\ \ \ \ \
| * | | | | Backport of mr_widget_author.vue EE changesPhil Hughes2018-02-021-1/+21
* | | | | | Merge branch 'axios-project' into 'master'Fatih Acet2018-02-021-9/+10
|\ \ \ \ \ \
| * | | | | | Replace $.ajax in project.jsaxios-projectClement Ho2018-02-011-9/+10
* | | | | | | Merge branch '42695-sign-in-page-logo-is-not-properly-rendered' into 'master'Clement Ho2018-02-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Place brand_image outside <h1> tag42695-sign-in-page-logo-is-not-properly-renderedToon Claes2018-02-021-1/+1
* | | | | | | | Merge branch '32283-trending-projects-unique-constraint2' into 'master'Yorick Peterse2018-02-023-1/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Add unique constraint to trending_projects#project_id.Andreas Brandl2018-02-023-1/+25
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '42696-gitlab-import-leaves-group_id-on-projectlabel' into 'master'Stan Hu2018-02-026-4/+50
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix specJames Lopez2018-02-021-1/+1
| * | | | | | | fix schemaJames Lopez2018-02-021-1/+1
| * | | | | | | add changelogJames Lopez2018-02-021-0/+5
| * | | | | | | add migrationJames Lopez2018-02-021-0/+19
| * | | | | | | add migration specJames Lopez2018-02-021-0/+21
| * | | | | | | fix label issueJames Lopez2018-02-022-3/+4
|/ / / / / / /
* | | | | | | Merge branch '3867-port-to-ce' into 'master'Sean McGivern2018-02-0274-822/+914
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into '3867-port-to-ce'Sean McGivern2018-02-0245-447/+942
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch '42223-squashing-mrs-takes-too-long' into 'master'Sean McGivern2018-02-022-5/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-longAlejandro Rodríguez2018-02-012-5/+43