summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* elastic: almost all integrated exept view logicelasticsearchValery Sizov2016-01-071-2/+2
|
* elastic search init commitValery Sizov2016-01-051-34/+45
|
* Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-2512-153/+225
|\
| * Fixed codestyle and added 2FA documentationfeature/force-tfaGabriel Mazetto2015-12-242-3/+5
| |
| * Add to application_settings forced TFA optionsGabriel Mazetto2015-12-241-0/+2
| |
| * specs for forced two-factor authentication and grace periodGabriel Mazetto2015-12-242-8/+11
| | | | | | | | simplified code and fixed stuffs
| * Grace period support for TFAGabriel Mazetto2015-12-242-3/+31
| |
| * WIP require two factor authenticationGabriel Mazetto2015-12-242-0/+14
| |
| * Merge branch 'new-project-header-redesign' into 'master' Dmitriy Zaporozhets2015-12-241-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now Fixes #2876 and #3482 Used existing styles. <br/> Did not attempt to make pixel perfect as styles already exist. <br/> ![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png) See merge request !2156
| | * adds starring and unstarring text to star button, also adds partial new stylesJacob Schatz2015-12-231-1/+1
| | |
| * | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-246-149/+171
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically fork a project when not allowed to edit a file. Fixes #3215. To do: - [ ] Add tests ----- ## "Edit" button on file in a project the user does NOT have write access to ![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png) ## Clicking will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the edit page on the original project with a notice ![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png) ## The user cannot change the target branch and is informed that editing will start an MR ![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png) ## Hitting "Commit changes" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png) ----- ## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to ![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png) ## Clicking any of these options will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the tree page on the original project with a notice ![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png) ## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR ![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png) ## Hitting "Create directory" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png) cc @dzaporozhets @skyruler See merge request !2145
| | * Add tests for new functionalityDouwe Maan2015-12-211-1/+5
| | |
| | * Fix specs and behavior for LFS filesDouwe Maan2015-12-183-7/+15
| | |
| | * Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-186-148/+158
| | |
| * | Merge branch 'improve_emoji_picker' into 'master' Dmitriy Zaporozhets2015-12-231-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve emoji picker This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well. Some categories are pretty poor, it can be extended in the future. It's a first step on the way to improve picker. The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution. ![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png) See merge request !2172
| | * | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-1/+0
| | | |
| * | | Make CI Lint form synchronousfix/ci-lintGrzegorz Bizon2015-12-221-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. Closes #4206
* | | Add ability to create a note when blocking a userValery Sizov2015-12-251-1/+1
| | |
* | | Rename group statistics to contribution analyticsDmitriy Zaporozhets2015-12-231-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' into ce_upstreamValery Sizov2015-12-234-3/+47
|\ \ \ | |/ /
| * | Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-211-1/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow admin to create new user identities Fixes #2442 See merge request !2077
| | * | Allow admin to create new user identitiesDrew Blessing2015-12-151-1/+16
| | | |
| * | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-212-1/+30
| |\ \ \
| | * | | add CAS authentication supporttduehr2015-12-142-1/+30
| | |/ /
| * | | Backport JIRA serviceDrew Blessing2015-12-181-2/+3
| | |/ | |/|
* | | Merge branch 'jenkins_gitlab_plugin' into 'master' Robert Speicher2015-12-211-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Jenkins GitLab Plugin Fixes #106 Deprecate the existing Jenkins service, which uses GitLab Hook plugin. Adds support for GitLab Plugin which utilizes the GitLab commit status API. The overall experience is much better. See merge request !79
| * | | Use Jenkins GitLab PluginDrew Blessing2015-12-181-1/+2
| | | |
* | | | Merge branch 'issue-weight' into 'master' Douwe Maan2015-12-191-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add weight field to the issue Fixes #70 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !76
| * | | Add weight field to the issueDmitriy Zaporozhets2015-12-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Add GitLab PagesKamil Trzcinski2015-12-182-0/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The pages are created when build artifacts for `pages` job are uploaded - Pages serve the content under: http://group.pages.domain.com/project - Pages can be used to serve the group page, special project named as host: group.pages.domain.com - User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project - Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings - The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB) - The public/ is extracted from artifacts and content is served as static pages - Pages asynchronous worker use `dd` to limit the unpacked tar size - Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml - Pages are part of backups - Pages notify the deployment status using Commit Status API - Pages use a new sidekiq queue: pages - Pages use a separate nginx config which needs to be explicitly added
* | | Merge remote-tracking branch 'ce/master'Robert Speicher2015-12-174-10/+8
|\ \ \ | |/ /
| * | Merge branch 'fix-merge-immediately' into 'master' Robert Speicher2015-12-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 'Merge Immediately' button Fixes #4125 See merge request !2117
| | * | Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
| | | |
| * | | Merge branch 'fix-endpoint-not-setting-var' into 'master' Douwe Maan2015-12-161-6/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fix endpoint not setting needed @ci_commit /cc @DouweM See merge request !2112
| | * | Fix endpoint not setting needed @ci_commitZeger-Jan van de Weg2015-12-161-6/+3
| | | |
| * | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-163-3/+4
| |\ \ \
| | * | | Fixed Rubocop offensesGabriel Mazetto2015-12-153-3/+4
| | | |/ | | |/|
* | | | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-12-1531-420/+192
|\ \ \ \ | |/ / /
| * | | Merge branch 'rs-issue-4032' into 'master' Douwe Maan2015-12-151-1/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fix note polling Closes #4032 See merge request !2084
| | * | Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
| | |/ | | | | | | | | | Closes #4032
| * | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
| | |
| * | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1430-424/+185
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
| | * \ Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1425-325/+179
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| | | * | Fix after column renameKamil Trzcinski2015-12-111-1/+1
| | | | |
| | | * | Fix errorsKamil Trzcinski2015-12-111-3/+0
| | | | |
| | | * | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-116-14/+14
| | | | |
| | | * | Add runners tokenKamil Trzcinski2015-12-112-8/+1
| | | | |
| | | * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1124-315/+179
| | | | |
| | * | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-144-96/+5
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| | | | | | | | | Ci Services migrate See merge request !1985
| | | * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-104-96/+5
| | | |