summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch '22850-404-when-requesting-build-trace' into 'master' Kamil Trzciński2017-03-241-1/+1
|\ \ \ \ \ \
| * | | | | | No need to authorize_update_build! if 'trace' requested (as same as 'raw')Shinya Maeda2017-03-231-1/+1
| | |/ / / / | |/| | | |
* | | | | | Add dropdown sort to project milestonesGeorge Andrinopoulos2017-03-241-3/+6
* | | | | | fix new MR form erroneously selects tag as source when branch of same name ex...Sanster2017-03-241-2/+2
| |/ / / / |/| | | |
* | | | | Return 404 if deploy key cannot be found in Projects::DeployKeysController#di...Adam Niedzielski2017-03-231-1/+3
* | | | | Don't try to find a user by personal_access_token if the token is nilRémy Coutable2017-03-221-2/+5
|/ / / /
* | | | Merge branch 'profile-project-pagination-json-fix' into 'master' Jacob Schatz2017-03-221-2/+2
|\ \ \ \
| * | | | Fixed pagination in projects & snippets on user pagePhil Hughes2017-03-181-2/+2
| |/ / /
* | | | Merge branch '29483-spam-check-only-title-and-description' into 'master' Sean McGivern2017-03-221-1/+8
|\ \ \ \
| * | | | Present ajax call errors when failing to update an IssueOswaldo Ferreira2017-03-211-1/+8
* | | | | Merge branch 'revert-37328406' into 'master' Rémy Coutable2017-03-211-1/+1
|\ \ \ \ \
| * | | | | Revert "Merge branch '29534-todos-performance' into 'master'"Sean McGivern2017-03-211-1/+1
* | | | | | Merge branch 'sh-fix-issue-29739' into 'master' Sean McGivern2017-03-211-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix Error 500 when Bitbucket importer does not have authorizationStan Hu2017-03-201-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch '29428-new-directory-from-existing-branch' into 'master' Sean McGivern2017-03-213-5/+6
|\ \ \ \ \
| * | | | | New directory from interface on existing branchJacopo2017-03-213-5/+6
* | | | | | Hide ancestor groups in the share group dropdown listdz-hide-share-group-ancestorsDmitriy Zaporozhets2017-03-211-0/+1
| |_|/ / / |/| | | |
* | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-202-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-202-2/+2
| |/ / /
* | | | Merge branch '20204-new-issue-button-redirects-you-to-create-a-new-issue-afte...Sean McGivern2017-03-201-0/+2
|\ \ \ \
| * | | | Redirect to signin when New Issue for not logged inSam Rose2017-03-201-0/+2
* | | | | Fix Project Wiki updateDongqing Hu2017-03-201-1/+2
* | | | | Todos performance: Include associations in FinderJarka Kadlecova2017-03-201-1/+1
| |/ / / |/| | |
* | | | All CI offline migrationsKamil Trzciński2017-03-171-1/+0
| |_|/ |/| |
* | | Add ability to disable Merge Request URL on pushAlex Sanford2017-03-171-0/+1
| |/ |/|
* | Merge branch 'fix-slow-queries-for-branches-index' into 'master' Douwe Maan2017-03-162-3/+11
|\ \