summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-ci-permissions' into 'master' Dmitriy Zaporozhets2015-09-221-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Fix CI permissions ![Screen_Shot_2015-09-21_at_20.23.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6f40699507d0dce148d0054a093f0d63/Screen_Shot_2015-09-21_at_20.23.16.png) This fixes two problems: - Allow developers to retry builds - Hide advanced project options from CI page for non-admin users See merge request !1379
| * Fix permissions problemsKamil Trzcinski2015-09-211-1/+1
| | | | | | | | | | - Allow developers to retry builds - Hide advanced project options from CI page for non-admin users
* | Merge branch 'fix-issue-2593' into 'master' Robert Speicher2015-09-211-4/+6
|\ \ | |/ |/| | | | | | | | | Fix Error 500 when comparing non-existing branches Closes #2593 See merge request !1355
| * Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-181-4/+6
| | | | | | | | Closes #2593
* | Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-211-0/+7
| | | | | | | | | | | | | | This will fix merge problem for merge requests between forks created before 8.0 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-211-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification levels can now be set on the Project's main page ![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png) The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level. Saving is done via a remote form submission and if successful shows the user a flash message: ![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png) @DouweM can you please review my code. I gave my bestest effort to make in clean and readable. @rspeicher hopefully we can include it with the 8.0 release, maybe? /cc @darby See merge request !1322
| * | Minor code cleanupnotification-levelsDouwe Maan2015-09-201-2/+3
| | |
| * | Use the `find_by_user_id` magic finder instead of `where`.Patricio Cano2015-09-161-1/+1
| | |
| * | Merge branch 'master' into notification-levelsPatricio Cano2015-09-1626-13/+941
| |\ \
| * \ \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-1616-44/+63
| |\ \ \
| * | | | Notification dropdown now shows currently active level, and also shows what ↵Patricio Cano2015-09-141-1/+3
| | | | | | | | | | | | | | | | | | | | the actual value of `global` is, if the project has the notification level set to global.
| * | | | Notification level can now be saved from within the project view.Patricio Cano2015-09-141-1/+1
| | | | |
| * | | | PAtrially working notification buttonDarby2015-09-141-0/+1
| | | | |
* | | | | Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
* | | | | Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-191-1/+1
| | | | |
* | | | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-11/+1
| |_|_|/ |/| | |
* | | | Allow to disable GitLab CIKamil Trzcinski2015-09-183-2/+16
| | | |
* | | | Merge branch 'add-custom-text-to-help' into 'master' Jeroen van Baarsen2015-09-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom info to be added to Help page Fixes #2536 **Admin screen** ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e62f3e0ff40558fb955f09e469293521/image.png) **Text on the Help page** ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/ba315fb418e1698d8f44b88c7cc6c29a/image.png) /cc @DouweM See merge request !1309
| * | | | Allow custom info to be added to Help pageJeroen van Baarsen2015-09-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | Merge branch 'fix-ci-non-public-project' into 'master' Dmitriy Zaporozhets2015-09-181-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 when accessing private project when not logged in See merge request !1336
| * | | | | Fix 500 when accessing private project when not logged infix-ci-non-public-projectKamil Trzcinski2015-09-171-3/+1
| |/ / / /
* | | | | Merge branch 'ci_projects_order' into 'master' Valery Sizov2015-09-181-15/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix: ci projects order https://gitlab.com/gitlab-org/gitlab-ce/issues/2553 See merge request !1333
| * | | | Fix: ci projects orderci_projects_orderValery Sizov2015-09-171-15/+9
| | |_|/ | |/| |
* | | | Merge branch 'remove-ci-help' into 'master'Kamil Trzciński2015-09-171-16/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CI help Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2556 See merge request !1325
| * | | | Remove CI helpKamil Trzcinski2015-09-171-16/+0
| | | | |
* | | | | Move partial locals out of controllerStan Hu2015-09-171-11/+0
|/ / / /
* | | | Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-171-6/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
| * | | Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-151-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
* | | | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * \ \ \ Merge pull request #9634 from allistera/users-autocomplete-sort-orderStan Hu2015-09-151-0/+1
| |\ \ \ \ | | | | | | | | | | | | Sorted autocomplete users list by name
| | * | | | Sorted autocomplete users list by nameAllister Antosik2015-09-151-0/+1
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-151-0/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * | | | | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-151-0/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically adjust placedholder for uploads and fix Dropzone event handlers Override error handler to prevent error messages from being inserted underneath image preview Fix tests Use regexp instead of startsWith for better browser compatibility Remove duplicate code in _replace.html.haml and use one template Remove files upon error and retain alert messages until user adds a new file
* | | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-1518-53/+90
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * | | | Use fixed version of fogbugz gemJared Szechy2015-09-151-5/+3
| |/ / / | | | | | | | | | | | | This allows us to properly handle authentication errors.
| * | | Merge pull request #9138 from liyakun/masterStan Hu2015-09-141-4/+24
| |\ \ \ | | |_|/ | |/| | add "replace" and "upload" functionality
| | * | Add "Replace" and "Upload" featuresliyakun2015-09-151-4/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor upload and replace functionality Rename file and move CSS Fix typo Make dropzone a div Remove unnecessary file Change color of "upload existing one" Add missing changes
| * | Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-142-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all group public https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219# Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361 See merge request !1247
| | * | Allow access to group from root urlDmitriy Zaporozhets2015-09-141-1/+1
| | | |
| | * | Skip auth for group page but return auth for other group pagesDmitriy Zaporozhets2015-09-141-1/+1
| | | |
| * | | Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets2015-09-141-4/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import forked repositories asynchronously to prevent large repositories from timing out Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former. One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked. * Closes #2388 * Closes #2400 See merge request !1231
| | * | | Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu2015-09-111-4/+8
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
| * | | Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-103-1/+170
| |\ \ \ | | |/ /
| * | | Fix RootControllerDouwe Maan2015-09-091-1/+1
| | | |
| * | | Use new routing helperDouwe Maan2015-09-083-4/+4
| | | |
| * | | Move partial to right place and fix tests.Douwe Maan2015-09-083-3/+3
| | | |
| * | | Clean up overlap between dashboard and explore.Douwe Maan2015-09-0811-33/+46
| | | | | | | | | | | | | | | | | | | | - Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
| * | | Make Help accessible for guests.Douwe Maan2015-09-081-0/+2
| | | |
* | | | Fix: features/ci/runners_spec.rbKamil Trzcinski2015-09-151-1/+1
| | | |
* | | | fix specs. Stage 5Valery Sizov2015-09-151-2/+2
| | | |
View Lorry Controller Status