summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix on-hover state for 'Edit' button on tree viewValery Sizov2016-06-211-1/+1
|
* Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-175-9/+36
|\ | | | | | | | | Cache todo counters (pending/done) See merge request !4438
| * Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-175-9/+36
| | | | | | | | | | | | | | - As todos are created/updated inside the TodoService we repopulate the cache just there for both pending/done todos - Todos as mark as done from the TodosController we update cache there too - All the added methods are kept in the User class for cohesion
* | Fixed issue with assignee dropdown not selecting correctlyPhil Hughes2016-06-171-1/+1
| |
* | Merge branch 'clipboard-buttons-fix' into 'master' Robert Speicher2016-06-172-3/+13
|\ \ | | | | | | | | | | | | | | | | | | Fix clipboard buttons on "Check out branch" modal. Closes #18794 See merge request !4760
| * | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-172-3/+13
| |/ | | | | | | | | | | Also document the clipboard_button_with_class method. Fixes #18794.
* | Merge branch 'clipboard-button-styling' into 'master' Robert Speicher2016-06-171-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fixed styling of clipboard button Closes #18773 See merge request !4728
| * | Fixed styling of clipboard buttonclipboard-button-stylingPhil Hughes2016-06-171-1/+1
| | |
* | | Fix a 'wrong number of arguments' errorRémy Coutable2016-06-171-1/+1
| |/ |/| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-171-1/+6
|\ \ | | | | | | | | | | | | | | | | | | Fix error when editing an issuable with a task list Closes #18712 See merge request !4751
| * | Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todoDouglas Barbosa Alexandre2016-06-171-1/+6
| | |
* | | Merge branch 'contrib-calendar-colors' into 'master' Jacob Schatz2016-06-171-11/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with user calendar colors ## What does this MR do? Fixes an issue with the colors added onto the user contrib calendar. The calendar was change recently to remove a library which affected how the colors where generated. ## What are the relevant issue numbers? Closes #18505 ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_09.33.10](/uploads/f17451d2eb805e9d75d859cd1691e0bc/Screen_Shot_2016-06-13_at_09.33.10.png) See merge request !4614
| * | | Fixed issue with user calendar colorscontrib-calendar-colorsPhil Hughes2016-06-131-11/+6
| | | | | | | | | | | | | | | | Closes #18505
* | | | Merge branch '18724-dont-show-leave-project-to-group-member' into 'master' Douwe Maan2016-06-171-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show 'Leave Project' to group members ## What does this MR do? It hides the 'Leave Project' button to group members that are not explicitly a member of the project. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because there was an issue opened! ## What are the relevant issue numbers? Fixes #18724. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4739
| * | | | Don't show 'Leave Project' to group members18724-dont-show-leave-project-to-group-memberRémy Coutable2016-06-171-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-173-4/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sorting dropdown to tag page ## What does this MR do? Adds a sorting dropdown to the tags page just like the one on the branches page. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Clients were asking for this ## What are the relevant issue numbers? Closes #14918 ## Screenshots (if relevant) ![Captura_de_pantalla_2016-06-01_a_las_4.07.58_p.m.](/uploads/4530683ddd91d3bdbdce77748fe63f87/Captura_de_pantalla_2016-06-01_a_las_4.07.58_p.m..png) See merge request !4423
| * | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-163-4/+36
| | | | | |
* | | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-1727-31/+402
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114
| * | | | | | a few changes based on MR feedbackJames Lopez2016-06-174-9/+15
| | | | | | |
| * | | | | | fixed merge conflicts on UI branchJames Lopez2016-06-16225-1866/+2825
| |\ \ \ \ \ \
| | * \ \ \ \ \ fixed merge conflictsJames Lopez2016-06-16225-1860/+2819
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵feature/project-exportJames Lopez2016-06-16225-1860/+2819
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/project-export # Conflicts: # app/models/ci/pipeline.rb
| | | * | | | | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-16225-2819/+1860
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
| | | * | | | | | | squashed merge and fixed conflictsJames Lopez2016-06-16225-1860/+2819
| | | | | | | | | |
| * | | | | | | | | lots of refactoring again based on feedback. Changed the UI slightly and ↵James Lopez2016-06-1511-59/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed a small bug
| * | | | | | | | | fixing specs and some code cleanupJames Lopez2016-06-153-4/+8
| | | | | | | | | |
| * | | | | | | | | cleanup namespace check now done by serviceJames Lopez2016-06-151-11/+0
| | | | | | | | | |
| * | | | | | | | | enable retry on workerJames Lopez2016-06-151-2/+1
| | | | | | | | | |
| * | | | | | | | | some refactoring - renaming things, etc..James Lopez2016-06-152-5/+5
| | | | | | | | | |
| * | | | | | | | | project export archiverJames Lopez2016-06-143-3/+19
| | | | | | | | | |
| * | | | | | | | | get rid of old workerJames Lopez2016-06-141-24/+0
| | | | | | | | | |
| * | | | | | | | | yay finally importing working with the new services structureJames Lopez2016-06-141-1/+1
| | | | | | | | | |
| * | | | | | | | | few fixes after refactoring the whole UI stuffJames Lopez2016-06-142-4/+4
| | | | | | | | | |
| * | | | | | | | | adapted current services stuff to use new project import, plus fixes a few ↵James Lopez2016-06-143-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues, updated routes, etc...
| * | | | | | | | | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-1411-6/+63
| | | | | | | | | |
| * | | | | | | | | new export stuff and viewJames Lopez2016-06-143-11/+25
| | | | | | | | | |
| * | | | | | | | | lots of refactoring to reuse import serviceJames Lopez2016-06-148-18/+34
| | | | | | | | | |
| * | | | | | | | | WIP - starting refactoring import/export to use servicesJames Lopez2016-06-133-5/+25
| | | | | | | | | |
| * | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-06-13645-6219/+9079
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental # Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb
| | * | | | | | | | fixed specs and refactored a few things due to recent model changes and ↵James Lopez2016-06-132-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge conflicts
| | * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-06-13644-6182/+9061
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import # Conflicts: # app/models/project.rb # db/schema.rb # lib/gitlab/import_export/import_export_reader.rb
| | | * | | | | | | refactored loads of things due to commits to pipeline changeJames Lopez2016-06-131-4/+4
| | | | | | | | | |
| | | * | | | | | | Merge branches 'feature/project-export' and 'master' of ↵James Lopez2016-06-13272-2137/+4200
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-export
| | | * | | | | | | WIP - added missing notes, trying to fix specsJames Lopez2016-06-031-0/+4
| | | | | | | | | |
| | | * | | | | | | started refactoring a bunch of stuff based on feedbackJames Lopez2016-06-031-15/+18
| | | | | | | | | |
| | | * | | | | | | merge hellJames Lopez2016-06-03505-4399/+5208
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-03505-5208/+4399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2.
| | | * | | | | | | | Fix merge conflicts - squashed commitJames Lopez2016-06-03505-4399/+5208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/project.rb
| | * | | | | | | | | started refactoring some stuff based on MR feedbackJames Lopez2016-06-014-12/+16
| | | | | | | | | | |
| * | | | | | | | | | fix indentationJames Lopez2016-05-201-6/+6
| | | | | | | | | | |
View Lorry Controller Status