summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500...Kamil Trzciński2017-08-291-1/+1
|\
| * Remove trigger_request.trigger.ownerShinya Maeda2017-08-291-1/+1
* | Merge branch '36882-disable-gitlab-project-import-button-if-source-disabled' ...Filipa Lacerda2017-08-291-3/+4
|\ \
| * | Disable GitLab Project Import Button if source disabledMark Fletcher2017-08-241-3/+4
* | | Merge branch 'winh-member-search-dropdown' into 'master'Phil Hughes2017-08-291-0/+2
|\ \ \
| * | | Make member search dropdown consistentwinh-member-search-dropdownwinh2017-08-281-0/+2
* | | | Merge branch '37069-remove-li' into 'master'Phil Hughes2017-08-291-1/+1
|\ \ \ \
| * | | | Remove unnecessary divider37069-remove-liAnnabel Dunstone Gray2017-08-251-1/+1
* | | | | Merge branch '37102-fix-prometheus-graph-cursor-flag' into 'master'Phil Hughes2017-08-291-8/+8
|\ \ \ \ \
| * | | | | ensure graph overlay is in front of cursor flag37102-fix-prometheus-graph-cursor-flagMike Greiling2017-08-281-8/+8
* | | | | | Resolve "Monitoring graph date formatting is wrong"Mike Greiling2017-08-295-15/+22
* | | | | | Merge branch '36114-stuck-mrs-job-follow-up' into 'master'Sean McGivern2017-08-296-10/+20
|\ \ \ \ \ \
| * | | | | | Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-upOswaldo Ferreira2017-08-281-3/+6
| * | | | | | Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-284-5/+5
| * | | | | | Add changelogOswaldo Ferreira2017-08-281-1/+1
| * | | | | | Track enqueued and ongoing MRsOswaldo Ferreira2017-08-286-9/+16
| * | | | | | Remove locked? check when unlocking a merge requestOswaldo Ferreira2017-08-281-1/+1
* | | | | | | Add styles for shorter codeJacob Schatz2017-08-291-0/+24
* | | | | | | Merge branch '34413-move-convdev-index-location-to-after-cohorts' into 'master'Phil Hughes2017-08-293-8/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move ConvDev index to Overview from Monitoring.34413-move-convdev-index-location-to-after-cohortsBryce Johnson2017-08-183-8/+8
* | | | | | | Merge branch '36582-fix-note-resolved-icon' into 'master'evn-fix-formatting-of-claFatih Acet2017-08-285-6/+20
|\ \ \ \ \ \ \
| * | | | | | | Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-iconEric Eastwood2017-08-255-6/+20
* | | | | | | | Merge branch 'group-mr-search-bar' into 'master'Clement Ho2017-08-282-3/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add filtered search to group merge requests dashboardHiroyuki Sato2017-08-192-3/+7
* | | | | | | | Merge branch '36792-inline-user-refresh-when-creating-project' into 'master'Douwe Maan2017-08-284-10/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't treat gitlab project imports specially in Projects::CreateServiceNick Thomas2017-08-251-4/+2
| * | | | | | | | Don't add admins as masters to projects created in another user's namespaceNick Thomas2017-08-251-2/+1
| * | | | | | | | Move sidekiq-based project authorization refresh out of Projects::CreateServiceNick Thomas2017-08-254-8/+44
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-simplify-system-hook-testing' into 'master'Douwe Maan2017-08-281-34/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify system hook testing and guarantee test will firesh-simplify-system-hook-testingStan Hu2017-08-271-34/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'bugfix.notify-custom-participants' into 'master'Sean McGivern2017-08-282-28/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | don't rely on order of notification levelshttp://jneen.net/2017-08-211-27/+26
| * | | | | | | | actually use the :participating notification typehttp://jneen.net/2017-08-211-1/+1
* | | | | | | | | Merge branch 'backstage/gb/rename-ci-cd-processing-sidekiq-queues' into 'master'Grzegorz Bizon2017-08-2814-15/+39
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into backstage/gb/ren...backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-2616-62/+131
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'Kamil Trzciński2017-08-25143-411/+624
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enqueue a new stage worker in CI/CD processing queueGrzegorz Bizon2017-08-221-0/+2
| * | | | | | | | | | Merge branch 'master' into backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-2237-155/+418
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Include build queue worker in the processing groupGrzegorz Bizon2017-08-221-1/+3
| * | | | | | | | | | | Assign some CI/CD workers to pipeline default queueGrzegorz Bizon2017-08-213-6/+0
| * | | | | | | | | | | Remove sidekiq build queue and assign pipeline queueGrzegorz Bizon2017-08-216-13/+15
| * | | | | | | | | | | Assign all pipeline workers to specific queuesGrzegorz Bizon2017-08-216-0/+12
| * | | | | | | | | | | Simplify pipeline sidekiq queues naming schemeGrzegorz Bizon2017-08-212-5/+5
| * | | | | | | | | | | Extend pipelines queue mixin and add a default queueGrzegorz Bizon2017-08-212-1/+13
* | | | | | | | | | | | Merge branch 'jej/remove-dependent-destroy-from-protected-refs' into 'master'Yorick Peterse2017-08-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove 'dependent: :destroy' from ProtectedRef has_many :"#{type}_access_levels"jej/remove-dependent-destroy-from-protected-refsJames Edwards-Jones2017-08-251-1/+1
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Fire system hooks when a user is created via LDAP or OAuthsh-system-hooks-ldap-usersStan Hu2017-08-253-5/+18
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'fix-repo-scrollbar' into 'master'Jacob Schatz2017-08-251-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix repo editor scrollbarfix-repo-scrollbarClement Ho2017-08-241-1/+0
* | | | | | | | | | | Merge branch 'sh-sidekiq-backtrace' into 'master'Robert Speicher2017-08-256-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
View Lorry Controller Status