summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-092-8/+5
* Merge branch 'add-remember-option-u2f' into 'master' Robert Speicher2016-09-091-0/+1
|\
| * Pass the remember_me option into the u2f form and support it while authentica...add-remember-option-u2fDJ Mountney2016-09-011-0/+1
* | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-093-8/+10
|\ \
| * | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-053-8/+10
* | | Refresh todos count cache when an Issue/MR is deletedDouglas Barbosa Alexandre2016-09-081-0/+2
* | | Merge branch 'dz-bulk-edit-mr' into 'master' Rémy Coutable2016-09-082-27/+32
|\ \ \
| * | | Refactor code for bulk update merge requests featuredz-bulk-edit-mrDmitriy Zaporozhets2016-09-081-2/+2
| * | | Add bulk update support for merge requests listDmitriy Zaporozhets2016-09-082-26/+31
* | | | Merge branch 'dz-mr-version-compare' into 'master' Douwe Maan2016-09-081-5/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Refactor compared_diff_version method in merge requests controllerdz-mr-version-compareDmitriy Zaporozhets2016-09-071-6/+2
| * | | Refactor merge request version compare featureDmitriy Zaporozhets2016-09-071-6/+2
| * | | Improve merge request version featureDmitriy Zaporozhets2016-09-071-7/+5
| * | | Refactor code for merge request version compare featureDmitriy Zaporozhets2016-09-071-14/+30
| * | | Compare merge request version against other version on changes pageDmitriy Zaporozhets2016-09-071-1/+16
* | | | Use PipelinesFinder in Pipelines APIZ.J. van de Weg2016-09-071-5/+4
* | | | Code refactorKatarzyna Kobierska2016-09-071-4/+2
* | | | Code refactoringKatarzyna Kobierska2016-09-071-6/+3
* | | | Fix rubocop errorsKatarzyna Kobierska2016-09-071-1/+1
* | | | Change class method nameKatarzyna Kobierska2016-09-071-2/+2
* | | | Add class method to encapsulate exceptionKatarzyna Kobierska2016-09-071-3/+3
|/ / /
* | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-056-38/+33
|\ \ \ | |/ / |/| |
| * | Add option to confidential issues events to trigger servicesDouglas Barbosa Alexandre2016-08-311-1/+1
| * | Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-311-0/+1
| * | Refactoring Import::BaseController#find_or_create_namespaceDouglas Barbosa Alexandre2016-08-314-21/+26
| * | Don't create groups for unallowed users when importing projectsDouglas Barbosa Alexandre2016-08-314-23/+12
* | | Fix missing flash messages on service edit pageAirat Shigapov2016-09-051-3/+2
* | | Merge branch 'fix/handle-raw-trace-error-on-old-builds' into 'master' Douwe Maan2016-09-021-2/+2
|\ \ \ | |_|/ |/| |
| * | Update specs - add mocks to simulate old versionsTomasz Maczukin2016-09-012-6/+2
| * | Change 404 to 410 error when raw trace is unavailableTomasz Maczukin2016-09-012-1/+5
| * | Handle error on trace raw download with old builds (DB stored)Tomasz Maczukin2016-09-011-1/+1
* | | Merge branch 'issue-boards-issues-total-count' into 'master' Fatih Acet2016-09-011-6/+9
|\ \ \
| * | | Returns the total number of issues in the JSON responseDouglas Barbosa Alexandre2016-08-311-6/+9
| | |/ | |/|
* | | Project tools visibility levelFelipe Artur2016-09-019-12/+22
| |/ |/|
* | Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-312-7/+3
|\ \
| * | test if we can :read_group the group, not the namespacehttp://jneen.net/2016-08-301-1/+1
| * | remove Ability.abilitieshttp://jneen.net/2016-08-301-6/+2
* | | add specs for tags findertag-name-filtertiagonbotelho2016-08-311-1/+4
* | | filters tags by nametiagonbotelho2016-08-311-1/+2
| |/ |/|
* | Merge branch 'project-specific-lfs' into 'master' Robert Speicher2016-08-301-1/+1
|\ \
| * | Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-301-1/+1
| * | Added project specific enable/disable setting for LFSPatricio Cano2016-08-301-1/+1
| |/
* | Merge branch 'master' into prevent_authored_awardable_votesbarthc2016-08-301-7/+37
|\ \ | |/
| * Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-267-92/+19
| |\
| * | Extract ref_name and path in before_action, feedback:Lin Jen-Shin2016-08-261-5/+10
| * | Just use instance variable instead, feedback:Lin Jen-Shin2016-08-251-7/+2
| * | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-2413-11/+62
| |\ \
| * | | Path could also have slashes! Feedback:Lin Jen-Shin2016-08-241-3/+11
| * | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-1912-30/+132
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-187-14/+306
| |\ \ \ \
View Lorry Controller Status