summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0210-21/+66
|\
| * Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'27283-fix-wrong-label-hide-show-whitespaceSean McGivern2017-01-311-1/+32
| |\
| | * Abillity to promote project labels to group labelsRitave2017-01-311-1/+32
| * | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-311-1/+1
| |\ \
| | * | Update #list_teams to propagate errorsZ.J. van de Weg2017-01-301-4/+1
| | * | Fix inconsistent return typeZ.J. van de Weg2017-01-241-1/+4
| * | | Merge branch 'remove-warning-to-login' into 'master' Rémy Coutable2017-01-311-1/+2
| |\ \ \
| | * | | Remove flash warning from login pagePadilla, Gerald2017-01-301-1/+2
| * | | | Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'Rémy Coutable2017-01-312-1/+21
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Expose serialized pipelines API for merge requestsGrzegorz Bizon2017-01-271-1/+10
| | * | | Expose serialized pipelines for commit pipelinesGrzegorz Bizon2017-01-271-0/+11
| * | | | Added labels empty state and priority label empty state20852-getting-started-project-better-blank-state-for-labels-viewLuke "Jared" Bennett2017-01-301-7/+1
| * | | | Present group and dashboard MR list without grouping by projectOswaldo Ferreira2017-01-271-0/+5
| | |_|/ | |/| |
| * | | Merge branch 'speed-up-members-dropdown' into 'master' Douwe Maan2017-01-271-3/+2
| |\ \ \
| | * | | Don't call `#uniq` on a relationSean McGivern2017-01-271-3/+2
| * | | | Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-271-1/+1
| |\ \ \ \
| | * | | | Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-241-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'issue_27211' into 'master'Rémy Coutable2017-01-271-6/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Remove unused js response from refs controllerissue_27211Felipe Artur2017-01-261-6/+0
| * | | | Merge branch '27044-fix-explore-sorting-on-trending' into 'master' Fatih Acet2017-01-261-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix /explore sorting (trending)Eric Eastwood2017-01-261-0/+1
* | | | | Make sure different project gets a merge requestLin Jen-Shin2017-01-261-2/+4
* | | | | @tree_edit_project is no longer usedLin Jen-Shin2017-01-261-4/+1
* | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2631-277/+398
|\ \ \ \ \ | |/ / / /
| * | | | Fix access to the wiki code via HTTP when repository feature disabledDouglas Barbosa Alexandre2017-01-252-6/+12
| |/ / /
| * | | Merge branch 'backport-ee-1067-deal-with-repo-size-limit-as-byte' into 'master' Yorick Peterse2017-01-251-1/+5
| |\ \ \ | | |_|/ | |/| |
| | * | EE backport for new application settings serviceOswaldo Ferreira2017-01-231-1/+5
| | |/
| * | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-241-0/+14
| |\ \
| | * | Search feature: redirects to commit page if query is commit sha and only comm...YarNayar2017-01-241-0/+14
| * | | Merge branch 'disable-automatic-login-on-email-confirmation' into 'master' Marin Jankovski2017-01-241-6/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Disable automatic login feature when clicking on email confirmation linksdisable-automatic-login-on-email-confirmationBrian Neel2016-12-311-6/+2
| * | | pass username and id associations needed in the frontend26955-handle-legacy-issue-filter-paramsMike Greiling2017-01-201-18/+12
| * | | automatically redirect urls containing author_id or assignee_idMike Greiling2017-01-201-0/+18
| * | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-203-14/+22
| |\ \ \ | | |_|/ | |/| |
| | * | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pagesJose Ivan Vargas2017-01-181-4/+2
| | * | Removed the index action from both the projects hook and services controllersJose Ivan Vargas2017-01-182-9/+2
| | * | Corrected code style and titlesJose Ivan Vargas2017-01-181-1/+1
| | * | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-183-5/+22
| * | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-191-1/+1
| |\ \ \
| | * | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-181-1/+1
| | * | | Add Presentable concernRémy Coutable2017-01-181-1/+1
| * | | | Merge branch '26117-sort-pipeline-for-commit' into 'master' Kamil Trzciński2017-01-191-5/+0
| |\ \ \ \
| | * | | | Add sorting pipeline for a commitTakuya Noguchi2017-01-191-5/+0
| * | | | | Merge branch 'speed-up-dashboard-milestone-index' into 'master' Sean McGivern2017-01-191-2/+2
| |\ \ \ \ \
| | * | | | | Speed up dashboard milestone index by scoping IssuesFinder to user authorized...speed-up-dashboard-milestone-indexAdam Niedzielski2017-01-161-2/+2
| * | | | | | Merge branch 'current-user-filter-top' into 'master' Sean McGivern2017-01-191-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Shows current user on top of filtered dropdown listcurrent-user-filter-topPhil Hughes2017-01-171-1/+1
| * | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-183-64/+26
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | refactor fetcher and fixed specsJames Lopez2017-01-171-1/+1
| | * | | | | refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-172-10/+10
View Lorry Controller Status