summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Changed how collections are renderedPhil Hughes2016-10-067-30/+15
* Merge branch 'master' into members-uiPhil Hughes2016-10-06114-1339/+1763
|\
| * Merge branch 'revert/5991' into 'master' Sean McGivern2016-10-061-6/+1
| |\
| | * Revert "Label list shows all issues (opened or closed) with that label"Douglas Barbosa Alexandre2016-10-061-6/+1
| * | Merge branch 'new-merge-requests-commit-tab-active' into 'master' Fatih Acet2016-10-067-46/+84
| |\ \ | | |/ | |/|
| | * MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-067-46/+84
| * | Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'Rémy Coutable2016-10-065-12/+182
| |\ \
| | * | multi-file commitMarc Siegfriedt2016-10-055-12/+182
| * | | Merge branch 'jeroenj/gitlab-ce-group-milestone-archived-projects'Rémy Coutable2016-10-061-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Don't include archived projects when creating group milestonesJeroen Jacobs2016-10-051-2/+2
| * | | Merge branch 'feature/improve-async-pipeline-processing' into 'master' Kamil Trzciński2016-10-064-8/+32
| |\ \ \
| | * | | Do not return false in commit status transitionfeature/improve-async-pipeline-processingGrzegorz Bizon2016-10-043-7/+5
| | * | | Fix hipchat service specs after changes in pipelineGrzegorz Bizon2016-10-041-3/+2
| | * | | Update order of build transition callbacksGrzegorz Bizon2016-10-044-24/+22
| | * | | Extract updating pipeline status to async workerGrzegorz Bizon2016-10-043-13/+24
| | * | | Use internal commit status API to check if finishedGrzegorz Bizon2016-10-041-2/+2
| | * | | Fix async pipeline and remove unrelated changesGrzegorz Bizon2016-10-046-26/+16
| | * | | Make pipeline processing asynchronousKamil Trzcinski2016-10-037-23/+51
| * | | | Fix CHANGELOG and wrong conflict resolutionRémy Coutable2016-10-061-1/+1
| * | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-0611-19/+40
| |\ \ \ \
| | * \ \ \ Merge branch 'fix/escape-builds-commands-in-ci-linter' into 'security' Robert Speicher2016-09-281-2/+1
| | |\ \ \ \
| | | * | | | Escape HTML nodes in builds commands in ci linterGrzegorz Bizon2016-09-261-2/+1
| | * | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-288-18/+26
| | |\ \ \ \ \
| | | * | | | | Convert label creation from API to controller endpointNick Thomas2016-09-238-18/+26
| | * | | | | | Enforce the fork_project permission in Projects::CreateServiceNick Thomas2016-09-272-0/+14
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'flash-cherry-pick-error' into 'master' Fatih Acet2016-10-051-7/+2
| |\ \ \ \ \ \
| | * | | | | | Make flash-alert background transparent to match flash-notice.flash-cherry-pick-errorBryce Johnson2016-10-051-7/+2
| * | | | | | | Merge branch 'revert-c676283b' into 'master' Fatih Acet2016-10-0518-123/+214
| |\ \ \ \ \ \ \
| | * | | | | | | Fix bad merge conflict resolution.Fatih Acet2016-10-051-2/+0
| | * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-051-1/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283bFatih Acet2016-10-0536-988/+905
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Set default value for show_menu_above variable.Fatih Acet2016-10-051-1/+2
| | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-059-30/+77
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Add position menu above ability to glDropdown.Fatih Acet2016-10-047-39/+41
| | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-0429-89/+209
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Tweak issuable dropdowns to open above the dropdown.Fatih Acet2016-10-042-1/+29
| | * | | | | | | | | Fix dropdown title when No Label selected.Fatih Acet2016-10-042-23/+41
| | * | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-0429-53/+146
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Tests updatePhil Hughes2016-10-031-1/+1
| | * | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-03431-2733/+5529
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-09-02143-1123/+1563
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fixed boards filtersPhil Hughes2016-08-302-1/+3
| | * | | | | | | | | | | | Removed namespace testPhil Hughes2016-08-301-1/+1
| | * | | | | | | | | | | | Fixed label toggle textPhil Hughes2016-08-301-14/+17
| | * | | | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-08-30846-14049/+25105
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Removes @projects as not used anymore - getting selected data from controller...Phil Hughes2016-07-202-2/+2
| | * | | | | | | | | | | | | Fixed up frontend code based on feedbackPhil Hughes2016-07-208-16/+11
| | * | | | | | | | | | | | | Removed duplicate labels from the dropdown on dashboardPhil Hughes2016-07-204-22/+16
| | * | | | | | | | | | | | | Uses the selected values from the controller not the paramsPhil Hughes2016-07-209-57/+27
| | * | | | | | | | | | | | | Removes tick from no label when selecting a labelPhil Hughes2016-07-201-0/+6