summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-196-24/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
| * | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-1424-141/+145
| | | | | | | | | | | | | | | | | | | | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* | | | Split up AttachmentUploader.Douwe Maan2015-02-203-3/+3
| |/ / |/| |
* | | Fix active tab testsDmitriy Zaporozhets2015-02-192-15/+10
| | |
* | | Revert "Fix broken access control and refactor avatar upload"Dmitriy Zaporozhets2015-02-193-3/+3
| | | | | | | | | | | | This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
* | | Merge branch 'md-preview-class' into 'master'Dmitriy Zaporozhets2015-02-172-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure Markdown previews always use the same styling as the eventual destination. Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body. See merge request !1514
| * | | Make sure Markdown previews always use the same styling as the eventual ↵Douwe Maan2015-02-172-3/+3
| |/ / | | | | | | | | | destination.
* | | Fix broken access control and refactor avatar uploadHannes Rosenögger2015-02-163-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves the note folder from /public/uploads/note to /uploads/note and changes the uploader accordingly. Now it's no longer possible to avoid the access control by modifing the url. The Avatar upload has been refactored to use an own uploader as well to cleanly seperate the two upload types.
* | | Fix specs.Douwe Maan2015-02-132-6/+6
|/ /
* | Fixed deprecation in spinach stubsJeroen van Baarsen2015-02-121-1/+1
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Fixed tests for spinachJeroen van Baarsen2015-02-121-1/+1
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-082-1/+23
|\ \ | | | | | | Add Asana service
| * | Add restrict_to_branch to service controllerJeremy2015-02-021-0/+2
| | | | | | | | | | | | And add restrict_to_branch to spec
| * | Add Asana serviceJeremy2015-02-022-1/+21
| | | | | | | | | | | | Also add ability to render "service.help" in markdown
* | | Improve testsDmitriy Zaporozhets2015-02-062-5/+5
| | |
* | | Refactor issuable sorting a bitDmitriy Zaporozhets2015-02-051-1/+1
| | |
* | | Refactor sorting in projectDmitriy Zaporozhets2015-02-051-1/+1
| | |
* | | Merge branch 'foo-barred' into 'master'Dmitriy Zaporozhets2015-02-042-12/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the intermittently failing "Bar" search tests. Over the past several months we've come to calling them the foobarred tests. We've seen them fail on our jenkins server, and on the GitLab semaphore tests. In this merge request I scope the test checks for the foo barred tests to check within the .search-results div. Fixes #567 See merge request !258
| * | | Fixes the search test that fails whenever faker uses a name with Bar in it. ↵DJ Mountney2014-12-082-12/+12
| | | | | | | | | | | | | | | | Limit check to being within the search results div.
* | | | Spelling improvement, add in a group, not into group.Sytse Sijbrandij2015-02-032-2/+2
| |/ / |/| |
* | | Set right test as trickyDmitriy Zaporozhets2015-01-291-2/+2
| | |
* | | Skip tricky test for semaphoreDmitriy Zaporozhets2015-01-291-1/+1
| | |
* | | Fix test for merge requestDmitriy Zaporozhets2015-01-281-1/+3
| | |
* | | Merge branch 'init-from-ui' into 'master'Dmitriy Zaporozhets2015-01-273-0/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for creating bare repo and first file in UI Part of #1930 See merge request !1444
| * | | Add tests for initializing bare repo and creating new file in itDmitriy Zaporozhets2015-01-273-0/+28
| | | |
* | | | Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'Dmitriy Zaporozhets2015-01-272-49/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Move external issue tracker away from yml config See merge request !1442
| * | | Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-264-11/+65
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb spec/models/project_spec.rb
| * | | | Remove unused feature steps.Marin Jankovski2015-01-262-49/+0
| | | | |
* | | | | Fixed few tests and improved css styleDmitriy Zaporozhets2015-01-261-3/+2
| |/ / / |/| | |
* | | | Fix tests for blobs refactoringDmitriy Zaporozhets2015-01-261-1/+1
| | | |
* | | | Fix blob controller rendering in case of errorsDmitriy Zaporozhets2015-01-261-2/+2
| | | |
* | | | Fix tests, merge conflicts, some minor issues and make the project avatar ↵Hannes Rosenögger2015-01-241-5/+5
| | | | | | | | | | | | | | | | feature mergable
* | | | adding avatar to project settings page added avatar removal show project ↵Steven Thonus2015-01-242-3/+57
|/ / / | | | | | | | | | avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix
* | | Spinach for admin applicationsValery Sizov2015-01-193-0/+77
| | |
* | | Add tests to home page url redirectDmitriy Zaporozhets2015-01-162-4/+6
| |/ |/|
* | Fix testsDmitriy Zaporozhets2015-01-161-2/+2
| |
* | Merge pull request #7905 from cirosantilli/visible-falseDmitriy Zaporozhets2015-01-154-14/+3
|\ \ | | | | | | Change always passing visible false tests.
| * | Change always passing visible true tests to false.Ciro Santilli2015-01-024-14/+3
| | |
* | | Remove password strength indicatorJacob Vosmaer2015-01-152-57/+4
| | | | | | | | | | | | | | | | | | | | | | | | We were having the following issues: - the indicator would sometimes stay red even if the password that was entered was long enough; - the indicator had a middle yellow signal: what does that mean? - the red/green backgrounds were not color-blind-friendly.
* | | Revert "Fix tests"Dmitriy Zaporozhets2015-01-141-1/+1
| | | | | | | | | | | | This reverts commit 1e45ba7f169781d7c1d79fdfcee14760558db253.
* | | Fix testsDmitriy Zaporozhets2015-01-141-1/+1
| | |
* | | Fix randomly failing testDmitriy Zaporozhets2015-01-101-1/+1
| | |
* | | Improve application settings and write testsDmitriy Zaporozhets2015-01-083-0/+29
| | |
* | | Merge pull request #8520 from cirosantilli/edit-blob-link-testsDmitriy Zaporozhets2015-01-033-0/+28
|\ \ \ | |/ / |/| | Add tests for disabled blob edit button cases v2
| * | Add tests for disabled blob edit button cases.Ciro Santilli2014-12-303-0/+28
| | |
* | | Fix testsDmitriy Zaporozhets2014-12-301-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix testsDmitriy Zaporozhets2014-12-301-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix the ssh keys test.Marin Jankovski2014-12-301-3/+1
| | |
* | | Add feature spec for user ssh keys on admin page.Marin Jankovski2014-12-292-0/+42
|/ /
* | Fix testsDmitriy Zaporozhets2014-12-291-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status