summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Add directory feature buttonStan Hu2015-10-072-18/+76
| | | | | | | | | | | | | | | | | | Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557
* Render CI statuses on commit pageDmitriy Zaporozhets2015-10-062-2/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix rubocop warnings in featuresGuilherme Garnier2015-10-035-31/+29
|
* Merge remote-tracking branch 'public/hide_services_password'Dmitriy Zaporozhets2015-10-022-0/+5
|\
| * Hide password in the service settings formhide_services_passwordValery Sizov2015-10-022-0/+5
| |
* | Prevent creating 2 Ci::Project entities when enable CIDmitriy Zaporozhets2015-10-022-2/+2
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'disable-report-button-if-already-reported' into 'master' Douwe Maan2015-10-012-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the "Report abuse" button if a user has already been reported Hello, I've implemented the feature request #2330. Here is what it looks like: ![report-abuse-button-disabled](https://gitlab.com/rymai/gitlab-ce/uploads/420d51906eac1c40c50701a0a340474f/report-abuse-button-disabled.png) I hope that's an acceptable solution. cc @DouweM See merge request !1456
| * Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reportedRémy Coutable2015-09-292-4/+3
| | | | | | | | | | | | This simplifies the "Report button" to not use open a dropdown and adds a tooltip on this button. This also removes an extra spec and adds missing specs.
| * Disable the "Report abuse" button if a user has already been reportedRémy Coutable2015-09-292-0/+12
| |
* | Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-302-36/+36
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix testsKamil Trzcinski2015-09-292-2/+2
|/
* Merge branch 'projects'Dmitriy Zaporozhets2015-09-281-2/+1
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix testsDmitriy Zaporozhets2015-09-251-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix grammar in admin area labels .nothing-here-block when no labels exist.Aaron Snyder2015-09-261-1/+1
| | | | | | | | updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
* | Show CI status on Your projects page and Starred projects pageci-status-projects-pageDmitriy Zaporozhets2015-09-244-5/+17
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Show CI status on commit pagebuild-status-on-commit-pageDmitriy Zaporozhets2015-09-242-0/+14
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-232-2/+26
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-212-0/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'master' into notification-levelsPatricio Cano2015-09-162-2/+104
| |\
| * \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-169-24/+43
| |\ \
| * | | Added Global to the drop downs and updated the label of the button to show ↵Patricio Cano2015-09-161-2/+2
| | | | | | | | | | | | | | | | the current level instead of `Notifications`
| * | | Added Spinach tests and updated CHANGELOGPatricio Cano2015-09-162-0/+20
| | | |
* | | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-3/+1
| | | |
* | | | 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-issue-2382' into 'master'Stan Hu2015-09-173-3/+17
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-153-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-152-8/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #9138 from liyakun/masterStan Hu2015-09-142-2/+104
|\ \ \ | |_|/ |/| | add "replace" and "upload" functionality
| * | Add "Replace" and "Upload" featuresliyakun2015-09-152-2/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-143-14/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Make all group publicValery Sizov2015-09-093-14/+31
| | | |
* | | | Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets2015-09-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+159
|\ \ \ \ | |/ / /
| * | | Fix testStan Hu2015-09-101-2/+4
| | |/ | |/|
| * | Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-092-0/+155
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
| | * added spinach for glabal labelsglobal_labelsValery Sizov2015-09-032-0/+155
| | |
* | | Fix snippets exploration testDouwe Maan2015-09-091-1/+1
| | |
* | | Fix specDouwe Maan2015-09-091-1/+1
| | |
* | | Use new routing helperDouwe Maan2015-09-081-1/+1
| | |
* | | Clean up overlap between dashboard and explore.Douwe Maan2015-09-081-1/+1
| | | | | | | | | | | | | | | - 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.
* | | Consistently case `Back to X` links.Douwe Maan2015-09-082-3/+3
|/ /
* | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-072-3/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ui improvements * fix project home page when activity set as default * style commits, branches and tags pages to new style * render flash message outside of content block * style group pages See merge request !1255
| * | Fix compare testsDmitriy Zaporozhets2015-09-071-1/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix testsDmitriy Zaporozhets2015-09-071-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'crowd' into 'master'Valery Sizov2015-09-072-0/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
| * | | satisfy rubocopcrowdValery Sizov2015-09-073-22/+26
| | | |
| * | | added spinachValery Sizov2015-09-022-0/+26
| | |/ | |/|
* | | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-072-1/+20
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Wiki Page History This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes. Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399 See merge request !1232
| * | Fix broken Wiki Page HistoryStan Hu2015-09-012-1/+20
| |/ | | | | | | | | | | | | | | | | | | Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
View Lorry Controller Status