summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* fixed render_error not being hooked up correctlyPhil Hughes2017-10-265-34/+9
* fixed some state bugs with the tabsPhil Hughes2017-10-2610-38/+53
* correctly activate the next tab when closing a tabPhil Hughes2017-10-263-3/+28
* moved new file/directory into new storePhil Hughes2017-10-2619-692/+176
* [WIP] Move multi-file editor store to VuexPhil Hughes2017-10-2633-584/+910
* Merge branch 'jramsay-remove-superfluous-namespace' into 'master'Douwe Maan2017-10-241-2/+2
|\
| * Remove superfluous namespace from cluster settingsjramsay-remove-superfluous-namespaceJames Ramsay2017-10-221-2/+2
* | Merge branch 'suggest-rename-origin' into 'master'Sean McGivern2017-10-241-0/+1
|\ \
| * | Suggest to rename the remote for existing repositoriesHerman van Rink2017-10-201-0/+1
* | | Merge branch 'sh-fix-environment-write-ref' into 'master'Grzegorz Bizon2017-10-241-1/+1
|\ \ \
| * | | Fix the writing of invalid environment refssh-fix-environment-write-refStan Hu2017-10-231-1/+1
* | | | Merge branch '23000-pages-api' into 'master'Grzegorz Bizon2017-10-241-4/+4
|\ \ \ \
| * | | | Rename conflicting private method in PagesDomain modelTravis Miller2017-10-221-4/+4
| | |_|/ | |/| |
* | | | Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-244-13/+47
|\ \ \ \
| * | | | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-231-3/+2
| * | | | Allow configuring new circuitbreaker settings from the UI and APIBob Van Landuyt2017-10-233-10/+45
* | | | | Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-2418-32/+345
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdownPhil Hughes2017-10-239-12/+208
| |\ \ \ \ \
| * | | | | | spec fixesPhil Hughes2017-10-231-1/+1
| * | | | | | moved to eventHub to manage creating new filesPhil Hughes2017-10-237-50/+71
| * | | | | | fixed eslint :see_no_evil:Phil Hughes2017-10-231-3/+1
| * | | | | | added feature specPhil Hughes2017-10-232-4/+8
| * | | | | | fixed failing title testPhil Hughes2017-10-231-0/+1
| * | | | | | fixed bug with tabs not switching correctlyPhil Hughes2017-10-236-12/+53
| * | | | | | failing spec fixesPhil Hughes2017-10-235-30/+31
| * | | | | | correctly creates file in currently viewed directoryPhil Hughes2017-10-234-1/+5
| * | | | | | changed adding temp files/directories code to match new structurePhil Hughes2017-10-232-20/+37
| * | | | | | fixed new file/directory modal using methods that no longer existPhil Hughes2017-10-233-46/+47
| * | | | | | Add new files & directories in the multi-file editorPhil Hughes2017-10-2312-32/+257
* | | | | | | Merge branch 'hide-pipeline-zero-duration' into 'master'Grzegorz Bizon2017-10-241-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Hides pipeline duration in commit box when it is zero (nil)Guilherme Vieira2017-10-201-2/+3
* | | | | | | | Merge branch 'remove-new-sidebar-stuff' into 'master'Phil Hughes2017-10-247-43/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename new_sidebar in JSremove-new-sidebar-stuffAnnabel Dunstone Gray2017-10-202-5/+5
| * | | | | | | | Remove variables from sidebar CSSAnnabel Dunstone Gray2017-10-202-22/+20
| * | | | | | | | Replace all instances of new-sidebar with contextual-sidebarAnnabel Dunstone Gray2017-10-204-18/+14
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix-unresolve-btn-jump-color' into 'master'Phil Hughes2017-10-242-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix icon color and btn-group alignment of discussion buttonsfix-unresolve-btn-jump-colorAnnabel Dunstone Gray2017-10-232-2/+5
* | | | | | | | | Merge branch 'sticky-perf' into 'master'Filipa Lacerda2017-10-244-10/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed karma testssticky-perfPhil Hughes2017-10-231-1/+2
| * | | | | | | | | calculate the stickyTop instead of hard coding a variablePhil Hughes2017-10-233-4/+13
| * | | | | | | | | Fix performance of sticky.jsPhil Hughes2017-10-232-7/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '37860-pipelines-page' into 'master'Phil Hughes2017-10-236-74/+120
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changes after review37860-pipelines-pageFilipa Lacerda2017-10-233-3/+3
| * | | | | | | | | Merge branch 'master' into 37860-pipelines-pageFilipa Lacerda2017-10-2335-382/+399
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Make pipelines table in MR view usableFilipa Lacerda2017-10-186-74/+120
* | | | | | | | | | Merge branch '39299-sidebar-links' into 'master'Phil Hughes2017-10-232-11/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix button type39299-sidebar-linksFilipa Lacerda2017-10-231-1/+1
| * | | | | | | | | | Fix CSS in load more participantsFilipa Lacerda2017-10-232-11/+10
* | | | | | | | | | | Merge branch '38869-group-files' into 'master'Phil Hughes2017-10-234-33/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removes group_avatar & group_label_subscription from global namespaceFilipa Lacerda2017-10-234-33/+20
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |