summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-114-7/+15
|\
| * Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| * Merge branch 'note-preview' into 'security-10-2'Fatih Acet2017-12-081-1/+2
| * Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-081-0/+27
| * Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ...Douwe Maan2017-12-082-2/+2
* | Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'Sean McGivern2017-12-111-2/+8
|\ \
| * | Add recaptcha_check_if_spammable for issualbes than arent spammablesrecaptcha_check_if_spammable_ce_backportLuke Bennett2017-12-081-2/+8
| |/
* | Merge branch 'bw-todo-count-expiration' into 'master'Sean McGivern2017-12-111-2/+2
|\ \
| * | expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
* | | Fix image view modeClement Ho2017-12-111-2/+2
* | | Merge branch 'es-module-compare' into 'master'Filipa Lacerda2017-12-114-86/+73
|\ \ \ | |_|/ |/| |
| * | revert arrow function changees-module-compareMike Greiling2017-11-301-1/+1
| * | convert CompareAutocomplete from class definition into simple function call, ...Mike Greiling2017-11-303-65/+56
| * | convert Compare class into ES module import/export syntaxMike Greiling2017-11-303-4/+3
| * | refactor Compare class to ES class syntaxMike Greiling2017-11-301-18/+16
| * | remove commits.js import form main.js (related to !14735)Mike Greiling2017-11-301-1/+0
* | | Allow git pull/push on project redirectsMayra Cabrera2017-12-083-5/+60
* | | Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-088-35/+148
|\ \ \
| * | | Reduce the size of the deploy flag when there's no tag available38032-deploy-markers-should-be-more-verboseJose Ivan Vargas2017-12-071-3/+11
| * | | Changed the deploy markers on the prometheus dashboard to be more verboseJose Ivan Vargas2017-12-078-35/+140
* | | | Merge branch 'fix-event-target-author-preloading' into 'master'Douwe Maan2017-12-081-1/+1
|\ \ \ \
| * | | | Fix N+1 query when displaying eventsfix-event-target-author-preloadingYorick Peterse2017-12-081-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-081-12/+13
|\ \ \ \
| * | | | Implement and use Gitlab::Ci::Pipeline::Chain::CommandKamil Trzcinski2017-12-081-12/+13
* | | | | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-0811-63/+249
| |/ / / |/| | |
* | | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-086-42/+26
* | | | Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-083-5/+27
|\ \ \ \
| * | | | Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-073-5/+27
* | | | | Merge branch '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-079-13/+27
|\ \ \ \ \
| * | | | | Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-079-13/+27
* | | | | | Merge branch '40555-replace-absolute-urls-with-related-branches-to-avoid-host...Jacob Schatz2017-12-071-2/+2
|\ \ \ \ \ \
| * | | | | | Replace absolute URLs on related branches/MRs with relative url to avoid host...40555-replace-absolute-urls-with-related-branches-to-avoid-hostnameEric Eastwood2017-12-041-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into '...Jacob Schatz2017-12-071-0/+2
|\ \ \ \ \ \
| * | | | | | Fix loading branches list on cherry pick modal after merge.acet-fix-branches-list-on-cherry-pick-modal-after-mergeFatih Acet2017-12-041-0/+2
* | | | | | | Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into 'ma...Kamil Trzciński2017-12-073-1/+25
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Change feature flag to ci_disable_validates_dependencies to enable it as defaultShinya Maeda2017-12-071-1/+1
| * | | | | | Fix /build_spec.rbShinya Maeda2017-12-061-8/+8
| * | | | | | Optimize valid_dependency method by ayufan thoughtShinya Maeda2017-12-061-15/+11
| * | | | | | Add feature flagShinya Maeda2017-12-061-0/+2
| * | | | | | Add case when artifacts have not existed on dependenciesShinya Maeda2017-12-061-5/+15
| * | | | | | Use Class.new(StandardError) instead of custom extended error class. Bring ba...Shinya Maeda2017-12-062-3/+9
| * | | | | | Fail jobs if its dependency is missingShinya Maeda2017-12-063-1/+11
* | | | | | | Merge branch 'deploy-keys-loading-icon' into 'master'Filipa Lacerda2017-12-072-3/+11
|\ \ \ \ \ \ \
| * | | | | | | Fixed remove deploy key loading icon not being removed after cancelingdeploy-keys-loading-iconPhil Hughes2017-12-072-3/+11
* | | | | | | | Resolve "updateEndpoint undefined on Issue page"Luke Bennett2017-12-071-25/+2
* | | | | | | | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into '...Stan Hu2017-12-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update prometheus-client-mmap gem to highly optimized versionPawel Chojnacki2017-12-071-1/+1
* | | | | | | | | Merge branch 'merge-request-lock-icon-size-fix' into 'master'Annabel Dunstone Gray2017-12-072-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed merge request locked icon sizemerge-request-lock-icon-size-fixPhil Hughes2017-12-062-2/+2
* | | | | | | | | | Merge branch '40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-d...Kamil Trzciński2017-12-076-66/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
View Lorry Controller Status