summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Resolve "Clean up old project permissions frontend code"Mike Greiling2018-04-127-252/+16
* Align action icons in pipeline graphFilipa Lacerda2018-04-121-7/+1
* Merge branch 'move-help-state-vue-component' into 'master'Filipa Lacerda2018-04-122-25/+28
|\
| * Move TimeTrackingHelpState vue componentGeorge Tsiolis2018-04-112-25/+28
* | Merge branch 'winh-dropdown-entry-unlocking' into 'master'Phil Hughes2018-04-121-1/+1
|\ \
| * | Remove green background from unlock button in admin areaWinnie Hellmann2018-04-101-1/+1
* | | Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan2018-04-127-18/+21
|\ \ \
| * | | Support Markdown rendering using multiple projectsrendering-markdown-multiple-projectsYorick Peterse2018-04-117-18/+21
| |/ /
* | | Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'Marin Jankovski2018-04-121-1/+1
|\ \ \
| * | | Show build trace placeholder when build is runningGrzegorz Bizon2018-04-111-1/+1
* | | | Merge branch 'mk/geo/backport-broadcast-message-cache-expiration-hook' into '...Nick Thomas2018-04-111-1/+5
|\ \ \ \
| * | | | Backport: Propagate broadcast messages to secondariesMichael Kozono2018-04-111-1/+5
* | | | | Merge branch 'winh-protection-push-dropdowns-backport' into 'master'Clement Ho2018-04-113-7/+2
|\ \ \ \ \
| * | | | | Limit dropdown toggle width for protected branches / tagswinh-protection-push-dropdowns-backportWinnie Hellmann2018-04-053-7/+2
* | | | | | Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master'Clement Ho2018-04-111-4/+8
|\ \ \ \ \ \
| * | | | | | Add i18n and update specs for UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-271-4/+8
* | | | | | | Merge branch '41748-vertical-misalignment-login-box' into 'master'Clement Ho2018-04-115-22/+6
|\ \ \ \ \ \ \
| * | | | | | | Refactor CSS to eliminate vertical misalignment of login navTakuya Noguchi2018-04-115-22/+6
* | | | | | | | Merge branch 'move-estimate-only-pane-vue-component' into 'master'Filipa Lacerda2018-04-113-19/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Move TimeTrackingEstimateOnlyPane vue componentGeorge Tsiolis2018-04-113-19/+22
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'blackst0ne-rails5-update-event-subclass-from-attributes' into '...Yorick Peterse2018-04-111-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [Rails5] Update Event#subclass_from_attributes methodblackst0ne2018-04-111-0/+3
* | | | | | | | Resolve "tree/master shows incorrect CI build status"Lin Jen-Shin2018-04-113-3/+5
* | | | | | | | Replace vue resource with axios for pipeline details pageFilipa Lacerda2018-04-112-12/+7
* | | | | | | | Resolve "When editing a comment in an issue, the preview mode is toggled in t...Simon Knox2018-04-111-4/+6
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'ide-markdown-temp-file-fix' into 'master'Tim Zallmann2018-04-111-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed markdown preview in IDE not working for new filesPhil Hughes2018-04-101-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | [Rails5] Fix admin/application_settings_controllerblackst0ne2018-04-111-0/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch '40487-update-vue-resource-stage' into 'master'Phil Hughes2018-04-101-10/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update state request from vue resource to axiosFilipa Lacerda2018-04-101-10/+8
* | | | | Merge branch 'ab-37125-assigned-issues-query' into 'master'Yorick Peterse2018-04-101-4/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reduce complexity of issuable finder query.ab-37125-assigned-issues-queryAndreas Brandl2018-04-091-4/+7
* | | | | Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'"Kamil Trzciński2018-04-101-17/+2
| |/ / / |/| | |
* | | | Merge branch '40487-axios-pipelines' into 'master'Phil Hughes2018-04-103-72/+55
|\ \ \ \
| * | | | Replace vue resources with axios for pipelines tableFilipa Lacerda2018-04-093-72/+55
* | | | | Verify that deploy token has valid access when pulling container registry imageMayra Cabrera2018-04-102-2/+3
| |/ / / |/| | |
* | | | Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipient...Yorick Peterse2018-04-0915-41/+41
|\ \ \ \
| * | | | Add cop for has_many :through without disabled autoloadingfix-n-plus-one-when-getting-notification-settings-for-recipientsSean McGivern2018-04-099-28/+28
| * | | | Use Goldiloader for handling N+1 queriesYorick Peterse2018-04-098-13/+13
* | | | | Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master'Rémy Coutable2018-04-091-0/+8
|\ \ \ \ \
| * | | | | Work around Ruby 2.3.7 bug by defining prepended class methods needed for testsStan Hu2018-04-091-0/+8
* | | | | | Merge branch '44296-commit-path' into 'master'Phil Hughes2018-04-091-49/+58
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Checks if commit information exists before trying to render it44296-commit-pathFilipa Lacerda2018-04-061-49/+58
* | | | | | Merge branch 'blackst0ne-rails5-fix-frozen-array' into 'master'Sean McGivern2018-04-091-2/+1
|\ \ \ \ \ \
| * | | | | | Refactor `add_recipients`blackst0ne-rails5-fix-frozen-arrayblackst0ne2018-04-091-3/+2
| * | | | | | [Rails5] Fix spec/requests/projects/cycle_analytics_events_spec.rbblackst0ne2018-04-071-1/+1
* | | | | | | Merge branch '41981-allow-group-owner-to-enable-runners-from-subgroups' into ...Yorick Peterse2018-04-091-10/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove unused User#manageable_group_projects (#41981)Dylan Griffith2018-04-091-4/+0
| * | | | | | | Use project_authorizations instead of members to calculate manageable CI proj...Dylan Griffith2018-04-091-13/+1
| * | | | | | | Allow group owner to enable runners from subgroups (#41981)Dylan Griffith2018-04-091-5/+12