summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Make deploy-to dropdown on environments page consistentwinh-environments-deploy-dropdownwinh2017-08-291-0/+2
* 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
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Enable 5 lines of Sidekiq backtrace lines to aid in debuggingsh-sidekiq-backtraceStan Hu2017-08-256-0/+13
* | | | | | | | | Merge branch 'bvl-fix-mysql-bare-repository-importer' into 'master'Sean McGivern2017-08-251-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle creating a nested group on MySQL correctlybvl-fix-mysql-bare-repository-importerBob Van Landuyt2017-08-251-0/+4
* | | | | | | | | | Merge branch '35721-auth-style-confirmation' into 'master'Clement Ho2017-08-252-37/+49
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Authorizations regarding OAuth - style confirmationJacopo2017-08-242-37/+49
* | | | | | | | | | Merge branch '31409-fix-group-and-project-search-for-anonymous-users' into 'm...Kamil Trzciński2017-08-253-12/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor complicated API group finding rules into GroupsFinderNick Thomas2017-08-241-6/+30
| * | | | | | | | | | Fix group and project search for anonymous usersNick Thomas2017-08-242-6/+11
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Add support for copying permalink to notes via more actions dropdownDimitrie Hoekstra2017-08-253-12/+24
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge branch '36860-deleted-user-fix' into 'master'Sean McGivern2017-08-253-12/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix failure when issue author is nilJarka Kadlecova2017-08-253-12/+16
* | | | | | | | | | Merge branch 'fix/gb/fix-invalid-stage-status-transition' into 'master'Kamil Trzciński2017-08-251-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Set a default CI/CD status when it is not knownfix/gb/fix-invalid-stage-status-transitionGrzegorz Bizon2017-08-221-0/+4
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '36937-fix-invite-by-email-text' into 'master'Tim Zallmann2017-08-251-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix invite by email address duplicationMark Fletcher2017-08-251-3/+4
* | | | | | | | | | Merge branch 'zj-reword-job-to-pipeline-chart-view' into 'master'Douwe Maan2017-08-251-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Reword job to pipeline on the chart viewZeger-Jan van de Weg2017-08-241-3/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Revert "Merge branch 'sh-sidekiq-backtrace' into 'master'"Robert Speicher2017-08-256-13/+0
* | | | | | | | | Enable 5 lines of Sidekiq backtrace lines to aid in debuggingStan Hu2017-08-246-0/+13