summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't use capybara-screenshot in CI environmentsrs-capybara-screenshotRobert Speicher2015-04-252-6/+10
* Enable js_errors for Capybara in Spinach and RSpecRobert Speicher2015-04-252-2/+2
* Move RSpec setup for Capybara to its own support fileRobert Speicher2015-04-252-7/+20
* Reduce timeout for non-CI featuresRobert Speicher2015-04-251-2/+5
* Move Spinach setup for db_cleaner and capybara to their own filesRobert Speicher2015-04-253-26/+34
* Add capybara-screenshot gemRobert Speicher2015-04-252-4/+6
* Convert UserReferenceFilter#link_to_group to use a guard clauseRobert Speicher2015-04-251-7/+5
* Refactor `UserReferenceFilter#user_link_filter`Robert Speicher2015-04-251-35/+43
* Fix docs for `push_result`Robert Speicher2015-04-251-2/+2
* Merge branch 'rs-refactor-reference-extractor' into 'master'Robert Speicher2015-04-2521-257/+464
|\
| * Fix NotificationService specRobert Speicher2015-04-253-7/+7
| * Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractorRobert Speicher2015-04-251-4/+4
| * Rename `CommitRange#inclusive?` to `#exclude_start?`Robert Speicher2015-04-252-17/+15
| * Add CommitRange directly to results HashRobert Speicher2015-04-252-5/+5
| * Remove CommitRange#to_aRobert Speicher2015-04-252-40/+0
| * DRY up ReferenceExtractorRobert Speicher2015-04-251-9/+11
| * Don't allow nil references to get added to resultsRobert Speicher2015-04-251-0/+2
| * Include caret in CommitRange#reference_titleRobert Speicher2015-04-252-2/+6
| * Remove param from CommitRange#to_sRobert Speicher2015-04-252-22/+6
| * CommitRange improvementsRobert Speicher2015-04-252-16/+13
| * Update CommitRangeReferenceFilter to use CommitRange classRobert Speicher2015-04-252-37/+20
| * Add CommitRange classRobert Speicher2015-04-252-0/+283
| * Always use short SHAs as commit reference link textRobert Speicher2015-04-252-5/+15
| * Add to_param to mentionable spec's mockRobert Speicher2015-04-251-1/+1
| * Refactor ReferenceExtractor to use pipeline filtersRobert Speicher2015-04-252-193/+36
| * Add results to reference filtersRobert Speicher2015-04-2514-18/+129
| * Add `pipeline_result` to ReferenceFilterSpecHelperRobert Speicher2015-04-251-0/+14
| * Initialize the references result Hash in ReferenceFilterRobert Speicher2015-04-251-0/+16
|/
* Merge branch 'fix-slack-channel-in-admin-settings' into 'master'Douwe Maan2015-04-245-22/+26
|\
| * Fix bug where Slack service channel was not saved in admin template settings.Stan Hu2015-04-245-22/+26
* | Merge branch 'rs-simplify-uploads-controller' into 'master'Robert Speicher2015-04-241-5/+2
|\ \
| * | Simplify the `skip_before_filter` logic for UploadsControllerrs-simplify-uploads-controllerRobert Speicher2015-04-231-5/+2
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-245-32/+68
|\ \ \
| * \ \ Merge branch 'mobile-ui-improvements' into 'master'Dmitriy Zaporozhets2015-04-245-32/+68
| |\ \ \ | | |_|/ | |/| |
| | * | Improve mobile UI for dashboard and project pagesDmitriy Zaporozhets2015-04-245-32/+68
* | | | Merge branch 'username-period-again' into 'master'Douwe Maan2015-04-245-4/+102
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Rename namespace_regex to namespace_path_regex."Douwe Maan2015-04-247-13/+13
| * | | Explain namespace clearn regex.Douwe Maan2015-04-242-0/+10
| * | | Update schema.Douwe Maan2015-04-241-1/+1
| * | | Don't attempt to move if original path only contains periods.Douwe Maan2015-04-241-0/+3
| * | | Change migration timestamp.Douwe Maan2015-04-241-0/+0
| * | | Properly migrate users with usernames like "." or "..".Douwe Maan2015-04-242-1/+9
| * | | Rename namespace_regex to namespace_path_regex.Douwe Maan2015-04-247-13/+13
| * | | Move changelog item tot 7.11.Douwe Maan2015-04-241-1/+1
| * | | Revert "Revert disallowing usernames to end in period."Douwe Maan2015-04-243-2/+79
| |/ /
* | | Merge branch 'add_count_to_state_filters' into 'master'Marin Jankovski2015-04-242-3/+17
|\ \ \
| * | | Check if project before calling count on issuable.Marin Jankovski2015-04-241-1/+3
| * | | Add issue and merge request count for state filters.Marin Jankovski2015-04-242-3/+15
* | | | Merge branch 'canonical-source' into 'master'Dmitriy Zaporozhets2015-04-241-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Make source code on GitLab more prominent.Sytse Sijbrandij2015-03-251-4/+4