summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788Francisco Javier López2017-12-211-1/+1
* Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt2017-12-211-1/+1
* Merge branch 'zj-mr-diff-memoization-bug' into 'master'10-3-stable-prepare-rc3Sean McGivern2017-12-191-1/+1
* Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-192-7/+20
* Merge branch 'commit-diff-discussion-in-mr-context-fix-links' into 'master'⛄️ Sean McGivern ⛄️2017-12-191-5/+10
* Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-199-26/+23
* Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-193-5/+11
* Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-191-3/+9
* Return the noteable in Note#touch_noteablefix-throttled-update-for-10-3Yorick Peterse2017-12-141-0/+3
* Restore throttling of touchYorick Peterse2017-12-144-1/+47
* Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-141-1/+0
* Merge branch 'issue_41021' into 'master'10-3-stable-prepare-rc1Sean McGivern2017-12-134-3/+27
* Revert "Merge branch 'zj-memoization-mr-commits' into 'master'"Oswaldo Ferreira2017-12-132-20/+7
* Fix merge_request.rb conflict resolutionLUKE BENNETT2017-12-131-1/+0
* Fix wrong conflict resolution on !15858Oswaldo Ferreira2017-12-131-2/+1
* Merge branch '10-3-stable-prepare-rc1' of https://gitlab.com/gitlab-org/gitla...Luke Bennett2017-12-131-3/+3
|\
| * Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' into...Tim Zallmann2017-12-131-3/+3
* | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-132-7/+21
|/
* Merge branch 'fix-remove-branch-name-migration' into 'master'Sean McGivern2017-12-131-0/+4
* Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-131-2/+1
* Merge branch 'optimize-projects-for-imported-projects' into 'master'Yorick Peterse2017-12-131-1/+2
* Merge branch 'dm-image-blob-diff-full-url' into 'master'Sean McGivern2017-12-135-21/+34
* Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stal...Kamil Trzciński2017-12-131-8/+9
* Merge branch 'fix-image-view-mode' into 'master'Filipa Lacerda2017-12-131-2/+2
* Merge branch 'backport-epic-in-issue' into 'master'Jacob Schatz2017-12-139-58/+121
* Merge branch '35724-animate-sidebar' into 'master'Filipa Lacerda2017-12-1310-31/+36
* Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-134-7/+15
* Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'Sean McGivern2017-12-131-2/+8
* Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-131-12/+13
* Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-138-35/+148
* Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'Douwe Maan2017-12-133-5/+60
* Merge branch 'fix-event-target-author-preloading' into 'master'Douwe Maan2017-12-131-1/+1
* Merge branch '29483-no-feedback-when-checking-on-checklist-if-potential-spam-...Sean McGivern2017-12-1311-63/+249
* Revert "Merge branch 'throttle-touching-of-objects' into 'master'"Oswaldo Ferreira2017-12-124-47/+1
* 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