summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '55860-use-OpenShift' into 'master'Kamil Trzciński2019-01-031-1/+1
|\
| * Use OpenShift in docs and Web UI instead of OpenshiftTakuya Noguchi2019-01-021-1/+1
* | Merge branch 'use-after-transition' into 'master'Grzegorz Bizon2019-01-034-2/+8
|\ \
| * | Prefer to use after_transitionuse-after-transitionKamil Trzciński2019-01-024-2/+8
* | | Merge branch '55290-docs-update-link-to-updated-prometheus-url' into 'master'Kushal Pandya2019-01-032-2/+2
|\ \ \
| * | | Fix links to Prometheus Metrics LibraryTakuya Noguchi2018-12-132-2/+2
* | | | Merge branch 'ccr/49289_milestone_link' into 'master'Mike Greiling2019-01-0213-127/+127
|\ \ \ \
| * | | | Add project milestone link to dashboard milestonesccr/49289_milestone_linkFatih Acet2018-12-2013-127/+127
* | | | | Fix deprecation: redirect_to :back is deprecatedJasper Maes2019-01-023-3/+3
* | | | | Merge branch '55266-fix-incorrect-due-date-parsing' into 'master'Clement Ho2019-01-021-2/+7
|\ \ \ \ \
| * | | | | Use `parsePikadayDate` to parse due date stringKushal Pandya2018-12-271-2/+7
* | | | | | Merge branch '18667-handle-push-opts' into 'master'Douwe Maan2019-01-024-7/+22
|\ \ \ \ \ \
| * | | | | | Add support for Git push options, specifically ci.skipJonathon Reinhart2018-12-314-7/+22
* | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-1-43' into 'master'Kamil Trzciński2019-01-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update GitLab Runner Helm Chart to 0.1.43update-gitlab-runner-helm-chart-to-0-1-43Tomasz Maczukin2018-12-311-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon2019-01-023-4/+27
|\ \ \ \ \ \ \
| * | | | | | | Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-213-4/+27
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-0212-25/+78
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'security-master-secret-ci-variables-exposed' into 'master'John Jarvis2019-01-025-14/+53
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Support merge_request pipeline ref typesMatija Čupić2018-12-081-7/+3
| | * | | | | | | | Check resolved_ref before checking if protectedMatija Čupić2018-12-081-1/+2
| | * | | | | | | | Conditionally assign ref_name for more efficiencyMatija Čupić2018-12-081-1/+5
| | * | | | | | | | Add specs when full ref is passed to protected_forMatija Čupić2018-12-081-1/+1
| | * | | | | | | | Remove resolving conditional from protected_forMatija Čupić2018-12-081-7/+2
| | * | | | | | | | Raise an error on ambiguous refsMatija Čupić2018-12-082-1/+3
| | * | | | | | | | Rename Repository#resolve_ref to expand_refMatija Čupić2018-12-082-9/+8
| | * | | | | | | | Make full ref in Repository#resolve_ref explicitMatija Čupić2018-12-081-1/+1
| | * | | | | | | | Simplify conditionals in Project#protected_ref?Matija Čupić2018-12-081-2/+6
| | * | | | | | | | Implement Repository#ambiguous_ref?Matija Čupić2018-12-082-10/+9
| | * | | | | | | | Move Project#resolve_ref to RepositoryMatija Čupić2018-12-082-16/+16
| | * | | | | | | | Remove Repository#find_refMatija Čupić2018-12-081-10/+0
| | * | | | | | | | Use strings instead of Gitlab::Git::RefMatija Čupić2018-12-081-8/+9
| | * | | | | | | | Remove Gitlab::Git::Ref#full_refMatija Čupić2018-12-081-7/+5
| | * | | | | | | | Use nil instead of raising AmbiguousRefMatija Čupić2018-12-081-2/+3
| | * | | | | | | | Use Gitlab::Git::Ref in Project#resolve_refMatija Čupić2018-12-082-5/+16
| | * | | | | | | | Make HasRef#git_ref publicMatija Čupić2018-12-081-4/+0
| | * | | | | | | | Use full ref when possible to avoid ambiguityMatija Čupić2018-12-083-3/+26
| | * | | | | | | | Support both ref and ref-name in protected_for?Matija Čupić2018-12-081-4/+23
| * | | | | | | | | Merge branch 'security-todos_not_redacted_for_guests' into 'master'John Jarvis2019-01-027-11/+25
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Delete confidential issue todos for guestsFelipe Artur2018-12-147-11/+25
* | | | | | | | | | Merge branch '54206-show-the-activity-filter-dropdown-in-discussion-tab-only'...Kushal Pandya2019-01-022-2/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Made discussion filters only visible in merge request discussions tabConstance Okoghenun2019-01-022-2/+19
* | | | | | | | | | Merge branch '55369-update-milestone-sort-to-say-say-milestone-due-date' into...Sean McGivern2019-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Renames Milestone sort into Milestone due dateJacopo2018-12-311-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Resolve "User activity is stuck loading when there is none"Martin Wortschack2019-01-022-7/+13
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-0113-42/+85
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'security-53543-user-keeps-access-to-mr-issue-when-removed-from-...John Jarvis2019-01-011-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Adds validation to check if user can read projectTiago Botelho2018-12-191-1/+1
| * | | | | | | | | | Merge branch 'security-bvl-fix-cross-project-mr-exposure' into 'master'John Jarvis2019-01-011-7/+17
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Validate projects in MR build serviceBob Van Landuyt2018-12-141-7/+17
View Lorry Controller Status