summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-031-1/+2
| | |
| | * Fixed rspec tests for the project members also fixed the indexJose Ivan Vargas2017-01-031-42/+1
| | | | | | | | | | | | view (removed an extra tag )
| | * Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-032-4/+56
| | | | | | | | | | | | | | | | | | | | | This controller is going to contain both the project members and groups options for the settings gear. Generated the route and modified the routing to point to the new members setting path
| * | Speed up group milestone index by passing group_id to IssuesFinderAdam Niedzielski2017-01-063-24/+20
| | |
* | | Include resources to speed up pipelines serializerGrzegorz Bizon2017-01-051-1/+0
| | |
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-043-11/+12
|\ \ \ | |/ /
| * | Merge branch 'recaptcha_500' into 'master' Rémy Coutable2017-01-041-8/+8
| |\ \ | | | | | | | | | | | | | | | | Properly handle failed reCAPTCHA on user registration See merge request !8403
| | * | Properly handle failed reCAPTCHA on user registrationDrew Blessing2017-01-031-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user presses the 'Register' button too quickly after attempting to solve the reCAPTCHA, or the reCAPTCHA is not solved at all, the user would experience a 500 error. Now, the case is properly handled and the user will be sent back to the registration page with a clear error message and can try again.
| * | | Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-041-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add email confirmation field to registration form Closes #3053 See merge request !7432
| | * | | Add email and password confirmation fields to registration formDrew Blessing2017-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's too easy to mistype an email or password when signing up. The support team is receiving an increasing number of requests because users mistype their email. We can eliminate this problem by requiring users to confirm the email before registering. The same issue can occur for the password field so we should add this, too. We should note that password confirmation is part of the default Devise forms. I don't know why/when GitLab removed it.
| * | | | Merge branch ↵Fatih Acet2017-01-031-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version' into 'master' Resolve changing "from" version in diff comparison does not preserve "to" version Closes #25836 See merge request !8328
| | * | | Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-311-1/+2
| | | |/ | | |/|
| * | | Rename logo, apply for Slack tooZ.J. van de Weg2017-01-031-1/+1
| | | |
| * | | Add logo in public filesZ.J. van de Weg2017-01-031-1/+1
| | | |
| * | | Use stable icon for Mattermost integrationKamil Trzcinski2017-01-031-1/+1
| |/ /
* | | fix pipelines/index.html.haml merge conflictRegis2017-01-0212-14/+26
|\ \ \ | |/ /
| * | Merge branch 'issue_25578' into 'master' Sean McGivern2016-12-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix redirect after update file when user has forked project Closes #25578 See merge request !8371
| | * | Fix redirect after update file when user has forked projectFelipe Artur2016-12-291-1/+1
| | | |
| * | | Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-3/+0
| |/ /
| * | Merge branch 'dz-nested-group-misc' into 'master' Dmitriy Zaporozhets2016-12-291-0/+2
| |\ \ | | | | | | | | | | | | | | | | Miscellaneous improvements to the nested groups feature See merge request !8308
| | * | Show nested groups tab on group pageDmitriy Zaporozhets2016-12-261-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch '25925-fix-tag-sorting-and-filtering-options' into 'master' Annabel Dunstone Gray2016-12-291-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set default sort for tags to Last updated and fix nav controls spacing Closes #25925 See merge request !8263
| | * | | Set default sort for tags to Last updated25925-fix-tag-sorting-and-filtering-optionsSam Rose2016-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing between nav control elements Wrap navigation text on Tags list page
| * | | | Merge branch '19988-prevent-empty-pagination-when-list-not-empty' into 'master' Douwe Maan2016-12-284-0/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds kaminari_pagination controller concern with bounded pagination to not displ… Closes #19988 See merge request !8172
| | * | | | applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-233-3/+3
| | | | | |
| | * | | | adds specs for respective behaviourTiago Botelho2016-12-215-17/+16
| | | | | |
| | * | | | Prevent empty pagination when list is not emptyTiago Botelho2016-12-215-4/+17
| | | |/ / | | |/| |
| * | | | Fix: Admin group show page does not workfix-admin-group-pageValery Sizov2016-12-281-1/+1
| | |/ / | |/| |
| * | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-272-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to add deploy keys with write-access Closes #1376 See merge request !7383
| | * \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-2021-134/+306
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
| | * | | Merge CSSFilipa Lacerda2016-12-1213-29/+73
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-0624-81/+214
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
| | * | | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show write access information when showing the key. TODO: It's ugly right now, need help!
| | * | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-2220-57/+222
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (497 commits) Use single quote for strings Ue svg from SVGs object Dont trigger CI builds [ci skip] Revert "Test only migrations" Add custom copy for each empty stage Fetch only one revision Highlight nav item on hover Test only migrations Fix migration paths tests Scroll CA stage panel on mobile Fix CSS declaration administer to administrator Move SVGs to JS objects for easy reuse Improve deploy command message No enough data to Not enough data Keep the cookie name as before Fix variable usage Evalute time_ago method instead of printing it Removed button styling from restricted visibility levels and added checkboxes with icons Do not show overview message if there’s already CA data ...
| | * | | | | | Don't notify user for deploy keys, feedback:Lin Jen-Shin2016-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18517263
| | * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-179-14/+20
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (236 commits) Mention Git strategy none Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README Add stop environment permissions and remove delete Add note about auto-stopping of environments Update CHANGELOG.md for 8.13.6 Finish "Stopping envs" and "Grouping similar envs" sections Highlight first user autocomplete option Remove ToC and fix headings in Markdown docs Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'" ...
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-11-1076-549/+1426
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (3852 commits) Grapify token API Fix cache for commit status in commits list to respect branches Grapify milestones API Grapify runners API Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_check task Use 'Forking in progress' title when appropriate Fix CHANGELOG after 8.14.0-rc1 tag Update CHANGELOG.md for 8.14.0-rc1 Fix YAML syntax on CHANGELOG entry Remove redundant rescue from repository keep_around Remove redundant space from repository model code Remove order-dependent expectation Minor CHANGELOG.md cleanups Add a link to Git cheatsheet PDF in docs readme Grapify the session API Add 8.13.5, 8.12.9, and 8.11.11 CHANGELOG Merge branch 'unauthenticated-container-registry-access' into 'security' Merge branch '23403-fix-events-for-private-project-features' into 'security' Merge branch 'fix-unathorized-cloning' into 'security' Merge branch 'markdown-xss-fix-option-2.1' into 'security' ...
| | * | | | | | | | Set current user as deploy key userAli Ibrahim2016-09-031-1/+1
| | | | | | | | | |
| | * | | | | | | | Allow to add deploy keys with write-accessAli Ibrahim2016-08-171-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-263-5/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more storage statistics See merge request !7754
| | * | | | | | | | Add more storage statisticsMarkus Koller2016-12-213-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
* | | | | | | | | | merge master and fix application.rb conflictRegis2016-12-234-43/+50
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-212-43/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove Builds tab from Merge Requests and Commits" Closes #23638 See merge request !7763
| | * | | | | | | | Changes after reviewFilipa Lacerda2016-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken test Remove spinach tests for the builds tab
| | * | | | | | | | Remove builds tab from commitFilipa Lacerda2016-12-212-40/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused file Fix commit link
| | * | | | | | | | Removes builds tab from merge requestFilipa Lacerda2016-12-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix specs
| * | | | | | | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-0/+43
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-204-38/+141
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | WIPKamil Trzcinski2016-12-201-10/+11
| | | | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-201-0/+3
| | |\ \ \ \ \ \ \ \ \