summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-273-10/+5
* Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-274-9/+21
* Merge branch 'zj-commit-cache' into 'master'Sean McGivern2017-10-273-17/+31
|\
| * Cache commits on the repository modelZeger-Jan van de Weg2017-10-273-17/+31
* | Merge branch 'add-user-avatar-username-link' into 'master'Fatih Acet2017-10-271-3/+26
|\ \
| * | Rename to shouldShowUsernameClement Ho2017-10-271-3/+3
| * | Add configurable option to display username in user avatar link componentClement Ho2017-10-181-3/+26
* | | Merge branch 'ac-k8s-namespace-validator' into 'master'Rémy Coutable2017-10-271-1/+4
|\ \ \
| * | | Add KubernetesService#default_namespace testsac-k8s-namespace-validatorAlessio Caiazza2017-10-261-9/+2
| * | | namespace should be lowercased in kubernetes. This is also true for the scena...Mircea Danila Dumitrescu2017-10-041-1/+11
* | | | Merge branch '39441-bring-edit-form-back' into 'master'Rémy Coutable2017-10-272-1/+16
|\ \ \ \
| * | | | Revert "Merge branch '36670-remove-edit-form' into 'master'"39441-bring-edit-form-backSean McGivern2017-10-262-1/+16
* | | | | Merge branch '39188-change-default-disabled-merge-message' into 'master'Filipa Lacerda2017-10-271-2/+3
|\ \ \ \ \
| * | | | | Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-271-2/+3
* | | | | | Remove groups_select from global namespace & simplifies the codeFilipa Lacerda2017-10-273-113/+77
|/ / / / /
* | | | | Merge branch 'non-existing-repo-optimization' into 'master'Douwe Maan2017-10-261-2/+7
|\ \ \ \ \
| * | | | | Avoid calling underlying methods on non-existing reposnon-existing-repo-optimizationAlejandro Rodríguez2017-10-201-2/+7
* | | | | | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-261-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Validate username/pw for Jiraservice, require them in the APIRobert Schilling2017-10-241-0/+2
| | |_|_|/ | |/| | |
* | | | | Added ssh fingerprint, gitlab ci and pages information in an instance configu...Francisco Lopez2017-10-258-0/+198
* | | | | Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-255-12/+56
|\ \ \ \ \
| * | | | | Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-componentsFilipa Lacerda2017-10-195-12/+56
| | |/ / / | |/| | |
* | | | | Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-251-14/+4
|\ \ \ \ \
| * | | | | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-241-14/+4
| |/ / / /
* | | | | Merge branch '35199-case-insensitive-branches-search' into 'master'Sean McGivern2017-10-251-1/+1
|\ \ \ \ \
| * | | | | Add case insensitive branches searchGeorge Andrinopoulos2017-10-231-1/+1
* | | | | | Resolve "Remove overzealous tooltips in projects page tabs"Victor Wu2017-10-251-3/+3
* | | | | | Remove filter icon from search bar32318-filter-iconAnnabel Dunstone Gray2017-10-242-13/+1
* | | | | | 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
View Lorry Controller Status