summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-loginMaxime Besson2017-06-021-1/+5
| | | | | | | | | This commit lets a user bypass the automatic signin on the login form, in order to login with a technical (admin, etc) account Closes #3786 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-021-14/+25
|\ | | | | | | | | | | | | Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
| * Address review comments31511-jira-settingsJarka Kadlecova2017-06-021-2/+2
| |
| * Add feature tests for improved JIRA settingsJarka Kadlecova2017-06-011-7/+12
| |
| * simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-011-13/+19
| |
* | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-011-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Realtime env list Closes #31701 See merge request !11333
| * \ Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-0122-184/+326
| |\ \ | | |/
| * | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-254-8/+35
| |\ \
| * | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-241-1/+1
| | | |
| * | | Use etag caching for environments JSONZ.J. van de Weg2017-05-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the index view, the environments can now be requested every 15 seconds. Any transition state of a projects environments will trigger a cache invalidation action. Fixes gitlab-org/gitlab-ce#31701
* | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-011-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation for protected variables Closes #24196 See merge request !11688
| * \ \ \ Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-011-1/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | # Conflicts: # db/schema.rb
| * | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-018-126/+208
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-312-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (89 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| * \ \ \ \ \ Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-2614-62/+146
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-251-1/+2
| | | | | | | |
* | | | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-015-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Consistent diff and blob size limit names See merge request !11776
| * | | | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-295-6/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-318-126/+208
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-315-120/+196
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename BuildsController to JobsController Closes #30699 See merge request !11407
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-311-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-314-6/+4
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2621-73/+201
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
| | * | | | | | | | Add checks before redirect, remove status/traceLin Jen-Shin2017-05-242-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible urls, which were for javascripts
| | * | | | | | | | Use controllers to redirectLin Jen-Shin2017-05-232-0/+76
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-182-0/+4
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (31 commits) Remove 'no changes' entries from changelog Check if OLD is set when migrating issue assignees Fix data migration from trigger schedules Replace EFS section in AWS guide Add warning about AWS EFS and performance Consolidate opening text from about.gitlab.com and add active/passive note Fix invalid object reference in ee_compat_check script Fix Ordered Task List Items Add auxiliary viewer for README Update fe_guide testing.md Add auxiliary blob viewer for CHANGELOG Add spec for last commit info when browsing repository files Show last commit for current tree on tree page Use same last commit widget on project homepage and tree view Fix unassigned checkmark Add missing changelog for iPython notebook rendering feature Convert fa-history to svg; tweak alignment Get rid of pluck in app/services/members/authorized_destroy_service.rb Removes duplicate environment variable in documentation Fixed spacing issues in issue sidebar ...
| | * | | | | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-173-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
| * | | | | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-312-5/+11
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue inline editing Closes #24873 See merge request !11322
| | * | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-3014-57/+117
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Warn before moving issue in inline edit formPhil Hughes2017-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-2516-24/+94
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Added move to project in issue inline edit formPhil Hughes2017-05-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-162-3/+3
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added inline issue edit form actionsPhil Hughes2017-05-151-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Remove some deprecated methodstc-improve-project-api-perfToon Claes2017-05-301-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid the use of slow queries, remove some deprecated methods and encourage the use of ProjectFinder to find projects.
* | | | | | | | | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-311-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885
| * | | | | | | | | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-171-0/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides/disables some UI elements and API parameters related to nested groups when MySQL is used, since nested groups are not supported for MySQL.
* | | | | | | | | | Add per page to user autocomplete32977-user-autocomplete-per_page-does-not-workClement Ho2017-05-261-1/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher2017-05-263-5/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Consistently display last push event widget See merge request !11585
| * | | | | | | | Consistently display last push event widgetDouwe Maan2017-05-253-5/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-253-26/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Clean up diff rendering See merge request !11390
| * | | | | | | | Remove @commit in compare and MR controllersDouwe Maan2017-05-232-11/+1
| | | | | | | | |
| * | | | | | | | Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-232-3/+0
| | | | | | | | |
| * | | | | | | | Clean up diff renderingDouwe Maan2017-05-231-12/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan2017-05-251-6/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix: Always use the default language when generating emails. Closes #32748 See merge request !11662
| * | | | | | | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-languageRuben Davila2017-05-251-6/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition issue when the application was generating an email and was using a language that was previously being used in other request.
* | | | | | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-251-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
| * | | | | | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-241-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
* | | | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-255-18/+108
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027