summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'blackst0ne-rails5-add-safe-params-helper' into 'master'Sean McGivern2018-04-185-4/+5
|\
| * [Rails5] Add `safe_params` helperblackst0ne2018-04-085-4/+5
* | Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-184-6/+6
* | Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon2018-04-163-0/+11
|\ \
| * | embedded snippets supporthaseeb2018-02-283-0/+11
* | | Don't reset application settings oauth providers by mistakeDmitriy Zaporozhets2018-04-131-4/+7
* | | Don't reset application settings import sourcesDmitriy Zaporozhets2018-04-131-9/+1
* | | Merge branch 'dm-archived-read-only' into 'master'Robert Speicher2018-04-124-15/+24
|\ \ \
| * | | Correct permissions for creating merge requests from issuesBob Van Landuyt2018-04-111-1/+1
| * | | Share collaboration check between view and presenterBob Van Landuyt2018-04-112-17/+22
| * | | Rename `create_merge_request` permissionsBob Van Landuyt2018-04-113-3/+3
| * | | Prevent new merge requests for archived projectsBob Van Landuyt2018-04-111-1/+5
* | | | Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan2018-04-124-5/+7
|\ \ \ \
| * | | | Support Markdown rendering using multiple projectsrendering-markdown-multiple-projectsYorick Peterse2018-04-114-5/+7
| |/ / /
* | | | Resolve "tree/master shows incorrect CI build status"Lin Jen-Shin2018-04-111-0/+1
* | | | [Rails5] Fix admin/application_settings_controllerblackst0ne2018-04-111-0/+2
|/ / /
* | | Merge branch 'sh-handle-legacy-archive-requests' into 'master'Douwe Maan2018-04-091-2/+7
|\ \ \
| * | | Handle legacy repository archive requests with no ref givensh-handle-legacy-archive-requestsStan Hu2018-04-081-2/+7
| | |/ | |/|
* | | Projects and groups badges settings UIFrancisco Javier López2018-04-082-0/+26
|/ /
* | Handle limit for datetime attributes on MySQLMayra Cabrera2018-04-062-12/+1
* | Removes deploy tokens presenterMayra Cabrera2018-04-061-1/+1
* | Addresses database commentsMayra Cabrera2018-04-061-1/+1
* | Fixes broken schema and minor changesMayra Cabrera2018-04-061-2/+2
* | Get rid of Redis when dealing with deploy tokensKamil Trzciński2018-04-062-15/+23
* | Include ProjectDeployTokensMayra Cabrera2018-04-062-2/+2
* | Addreses backend review suggestionsMayra Cabrera2018-04-061-4/+0
* | Removes logic from Jwt and handle different scenarios on Gitlab::AuthMayra Cabrera2018-04-061-6/+1
* | Implement read_registry for DeployTokensMayra Cabrera2018-04-061-2/+11
* | Address UX reviewMayra Cabrera2018-04-062-10/+4
* | Create barebones for DeploytokenMayra Cabrera2018-04-062-0/+44
* | Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-061-1/+16
|\ \
| * | Add new repository archive routeJames Ramsay2018-04-061-1/+16
* | | Merge branch 'blackst0ne-rails5-update-skip-before-action-in-authenticates-wi...Douwe Maan2018-04-061-1/+1
|\ \ \
| * | | [Rails5] Add `raise: false` to skip_before_action in authenticates_with_two_f...blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concernblackst0ne2018-04-061-1/+1
* | | | Merge branch '43246-checkfilter' into 'master'Sean McGivern2018-04-061-0/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed dashboard filtering testsJan Provaznik2018-04-031-3/+8
| * | | Check if at least one filter is set on dashboardJan Provaznik2018-04-031-0/+14
* | | | Add confirmation modal to "Change username"Shah El-Rahman2018-04-061-6/+12
* | | | Merge branch 'issue_44270' into 'master'Sean McGivern2018-04-062-2/+3
|\ \ \ \
| * | | | Show issues of subgroups in group-level issue boardFelipe Artur2018-04-052-2/+3
* | | | | Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera2018-04-051-3/+5
* | | | | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-051-5/+8
|\ \ \ \ \
| * | | | | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-051-5/+8
| | |_|/ / | |/| | |
* | | | | Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'Kamil Trzciński2018-04-052-1/+2
|\ \ \ \ \
| * | | | | Allow HTTP(s) when git request is made by GitLab CITomasz Maczukin2018-04-052-1/+2
| |/ / / /
* | | | | Merge branch '44665-fix-db-trace-stream-by-raw-access' into 'master'Kamil Trzciński2018-04-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add change logShinya Maeda2018-04-061-2/+0
| * | | | Merge branch '44665-fix-db-trace-stream-by-raw-access' of gitlab.com:gitlab-o...Shinya Maeda2018-04-051-1/+1
| |\ \ \ \
| | * | | | Update jobs_controller.rbShinya Maeda2018-04-031-1/+1
| | * | | | Update jobs_controller.rbShinya Maeda2018-04-031-2/+0