summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Remove unused codeDouwe Maan2017-04-051-2/+1
* Address review commentsDouwe Maan2017-04-056-5/+25
* Correctly display multiple separate discussions on the same diff lineDouwe Maan2017-04-053-5/+5
* Don't use original_discussion_idDouwe Maan2017-04-051-6/+1
* Add specsDouwe Maan2017-04-051-7/+7
* Fix some specsDouwe Maan2017-04-051-0/+2
* Add option to start a new discussion on an MRDouwe Maan2017-04-056-83/+70
* MR empty stateLuke "Jared" Bennett2017-04-051-0/+1
* Create subgroups if they don't exist while importing projectsJames Lopez2017-04-051-9/+19
* Merge branch '29492-useless-queries' into 'master'Sean McGivern2017-04-041-0/+3
|\
| * Remove useless queries with false conditions (e.g 1=0)mhasbini2017-04-041-0/+3
* | Add feature flags for enabling (Upload|Receive)Pack for Gitalyfeature/add-feature-flags-for-upload-receive-packAhmad Sherif2017-04-031-1/+1
* | Merge branch 'introduce-base-polling-interval' into 'master' Sean McGivern2017-04-031-0/+1
|\ \
| * | Introduce "polling_interval_multiplier" as application settingAdam Niedzielski2017-04-031-0/+1
* | | Merge branch 'sh-fix-destroy-user-race' into 'master' Douwe Maan2017-04-031-2/+2
|\ \ \
| * | | Delete users asynchronouslysh-fix-destroy-user-raceStan Hu2017-04-021-2/+2
| | |/ | |/|
* | | Merge branch 'fix-nplusone-queries' into 'master' Robert Speicher2017-04-034-1/+4
|\ \ \ | |_|/ |/| |
| * | Fix a few N+1 queries identified by Bulletfix-nplusone-queriesStan Hu2017-04-024-1/+4
| |/
* | Fix redirection after login when the referer have paramsmhasbini2017-04-021-1/+1
|/
* Merge branch '25556-prevent-users-from-disconnecting-gitlab-account-from-cas'...Douwe Maan2017-03-311-1/+12
|\
| * Prevent users from disconnecting gitlab account from CASTiago Botelho2017-03-311-1/+12
* | Refactor SearchController#showDongqing Hu2017-03-311-33/+7
* | Handle parsing OpenBSD ps output properly to display sidekiqSebastian Reitenbach2017-03-311-1/+1
* | Allow users to import GitHub projects to subgroupsDouglas Barbosa Alexandre2017-03-301-1/+1
* | Merge branch 'tc-cleanup-application-settings-spec' into 'master' Sean McGivern2017-03-301-9/+0
|\ \
| * | Remove redundant code to convert restricted_levels to integersToon Claes2017-03-231-9/+0
* | | Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master' Rémy Coutable2017-03-291-1/+1
|\ \ \
| * | | There might be ps utilities out there, that assume 80chars insteadSebastian Reitenbach2017-03-281-1/+1
| | |/ | |/|
* | | Labels support color names in backendDongqing Hu2017-03-293-8/+13
|/ /
* | Merge branch '23363-use-strong-params-in-wikis-controller' into 'master' Rémy Coutable2017-03-281-1/+1
|\ \
| * | Update wikis_controller.rb to use strong paramsKeifer Furzland2017-03-251-1/+1
* | | Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into 'mast...Robert Speicher2017-03-271-1/+1
|\ \ \
| * \ \ Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-2413-23/+40
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-204-3/+5
| |\ \ \
| * \ \ \ Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-171-0/+1
| |\ \ \ \
| * | | | | Revert "Merge branch '8836-mr-revert' into 'master'Stan Hu2017-03-161-1/+1
* | | | | | Merge branch 'mr-diffs-speed-up' into 'master' Rémy Coutable2017-03-271-22/+22
|\ \ \ \ \ \
| * | | | | | Only load what we need when visiting MR diffs pageSean McGivern2017-03-271-22/+22
* | | | | | | Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serialize...Kamil Trzciński2017-03-273-2/+16
|\ \ \ \ \ \ \
| * | | | | | | Move conditional statement to PipelineSerializer#represent_statusShinya Maeda2017-03-231-1/+0
| * | | | | | | Use detailed_status effectively. Remove unnecesarry context(nest). Add new co...Shinya Maeda2017-03-231-0/+1
| * | | | | | | Rename endpoints 'status' to 'pipeline_status' in merge_requestsShinya Maeda2017-03-231-2/+2
| * | | | | | | Fix rspec failureShinya Maeda2017-03-233-6/+3
| * | | | | | | with_status to only_statusShinya Maeda2017-03-233-3/+3
| * | | | | | | Remove legacy def status from builds_controllerShinya Maeda2017-03-231-3/+0
| * | | | | | | Expose only status. ci_cd_status to status. Support abstract class.Shinya Maeda2017-03-233-10/+12
| * | | | | | | Add api points for ci cd status. Add favicon.Shinya Maeda2017-03-233-1/+19
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '20204-new-issue-button-redirects-you-to-create-a-new-issue-afte...Sean McGivern2017-03-271-0/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Display flash message to unauthenticated user when creating new issueSam Rose2017-03-251-0/+9
* | | | | | | Implement new service for creating userGeorge Andrinopoulos2017-03-272-16/+7
| |_|_|_|_|/ |/| | | | |