summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'option-to-be-notified-of-own-activity' into 'master' Douwe Maan2017-02-133-0/+136
|\
| * Use `let` in Profiles::NotificationsController specRichard Macklin2017-02-031-12/+9
| * Use check and uncheck methods from Capybara DSLRichard Macklin2017-02-011-2/+2
| * Add missing newline in Profiles::NotificationsController specRichard Macklin2017-02-011-0/+1
| * Add checkbox in UI to opt into receiving notifications about your activityRichard Macklin2017-02-011-0/+32
| * Update NotificationService to respect User#notified_of_own_activityRichard Macklin2017-02-011-0/+59
| * Add notified_of_own_activity to permitted attributesRichard Macklin2017-02-011-1/+2
| * Add controller spec for Profiles::NotificationsControllerRichard Macklin2017-02-011-0/+46
* | Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master' Rémy Coutable2017-02-131-3/+29
|\ \
| * | Show mentioned/issues being closed from a Merge Requests titleJan Christophersen2017-02-131-3/+29
* | | Merge branch 'rs-rubocop-rspec' into 'master' Rémy Coutable2017-02-132-55/+49
|\ \ \
| * | | Enable the `RSpec/ExpectActual` cop and correct offensesRobert Speicher2017-02-102-55/+49
* | | | Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-131-0/+11
|\ \ \ \
| * | | | Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-linesDouwe Maan2017-02-131-0/+11
* | | | | Merge branch '27939-fix-current-build-arrow' into 'master' Filipa Lacerda2017-02-131-0/+4
|\ \ \ \ \
| * | | | | Fix current build arrow27939-fix-current-build-arrowEric Eastwood2017-02-131-0/+4
* | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-134-0/+176
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add WikiPage.unhyphenizeAlex Braha Stoll2017-01-301-0/+8
| * | | | | Merge branch 'master' into 23535-folders-in-wiki-repositoryAlex Braha Stoll2017-01-29568-4415/+18670
| |\ \ \ \ \
| * | | | | | Remove directories as one of the attributes of WikiDirectoryAlex Braha Stoll2016-12-311-12/+3
| * | | | | | Change WikiPage#directoryAlex Braha Stoll2016-12-311-3/+3
| * | | | | | Remove WikiPage#full_pathAlex Braha Stoll2016-12-311-20/+0
| * | | | | | Add a breadcrumb at projects/wikis/show.html.hamlAlex Braha Stoll2016-12-311-0/+21
| * | | | | | Add WikiDirectory#to_partial_pathAlex Braha Stoll2016-12-311-0/+8
| * | | | | | Add WikiPage#to_partial_pathAlex Braha Stoll2016-12-311-0/+8
| * | | | | | Change WikiPage.group_by_directory to use WikiDirectoryAlex Braha Stoll2016-12-311-30/+42
| * | | | | | Add model WikiDirectoryAlex Braha Stoll2016-12-312-0/+51
| * | | | | | Change WikiPage.group_by_directory to order by directory and file alphabetica...Alex Braha Stoll2016-12-311-4/+26
| * | | | | | Change WikiPage#directory to always start a directory hierarchy with '/'Alex Braha Stoll2016-12-311-2/+2
| * | | | | | Add component to show the full path of a wiki page when viewing its contentAlex Braha Stoll2016-12-311-0/+40
| * | | | | | Add specs for WikiPage.group_by_directoryAlex Braha Stoll2016-12-311-6/+24
| * | | | | | Show directory hierarchy when listing wiki pagesAlex Braha Stoll2016-12-311-0/+17
* | | | | | | Merge branch 'dynamic-header-fixture' into 'master' Clement Ho2017-02-132-36/+1
|\ \ \ \ \ \ \
| * | | | | | | Replace static fixture for header_spec.js (!9174)winniehell2017-02-132-36/+1
* | | | | | | | Merge branch 'new-branch-fixture' into 'master' Clement Ho2017-02-133-6/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Replace static fixture for new_branch_spec.js (!9131)winniehell2017-02-113-6/+30
* | | | | | | | Merge branch 'fix/cycle-analytics-events-limit' into 'master' Sean McGivern2017-02-131-0/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | fix specJames Lopez2017-02-071-4/+5
| * | | | | | | | add specJames Lopez2017-02-062-35/+44
| * | | | | | | | user project and not empty_project as we need the repo stuffJames Lopez2017-02-061-1/+1
| * | | | | | | | fix typo [ci skip]James Lopez2017-02-061-2/+2
| * | | | | | | | Add limit to the number of events showed in cycle analytics and specJames Lopez2017-02-061-0/+35
* | | | | | | | | Merge branch '27886_rebasing_fix' into 'master'Sean McGivern2017-02-131-9/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Mark as WIP based on MR commits onlyJarka Kadlecova2017-02-131-9/+32
* | | | | | | | | | Merge branch '24976-start-of-line-mention' into 'master' Sean McGivern2017-02-133-1/+284
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Create directly_addressed Todos when mentioned in beginning of a lineErshad Kunnakkadan2017-02-083-1/+284
* | | | | | | | | | | Merge branch '20732_member_exists_409' into 'master'Sean McGivern2017-02-132-2/+344
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add member: Always return 409 when a member existsJarka Kadlecova2017-02-102-2/+344
* | | | | | | | | | | | Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-135-0/+117
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-095-0/+117
View Lorry Controller Status