summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix failing featuresroad-to-rspec-3Robert Speicher2015-06-143-3/+3
|
* Fix remaining deprecation warnings in specsRobert Speicher2015-06-143-15/+11
|
* Fix OAuth::User specRobert Speicher2015-06-141-25/+40
|
* Remove the "multiselect blob" featuresRobert Speicher2015-06-142-144/+0
| | | | These are better tested by Jasmine.
* Fix most ProjectMergeRequests feature stepsRobert Speicher2015-06-142-11/+8
|
* Fix failing Profile featureRobert Speicher2015-06-141-1/+1
|
* Fix shared DiffNote stepsRobert Speicher2015-06-141-15/+27
|
* Fix BroadcastMessages featureRobert Speicher2015-06-141-1/+1
|
* Fix remaining deprecation warnings in specsRobert Speicher2015-06-143-15/+10
|
* Update syntax for spec/{services,support,tasks,workers}Robert Speicher2015-06-144-30/+42
|
* Update syntax for spec/requestsRobert Speicher2015-06-144-5/+14
|
* Update syntax for spec/featuresRobert Speicher2015-06-142-3/+6
|
* Update syntax for spec/modelsRobert Speicher2015-06-1410-37/+48
|
* Update mock/expect syntax for spec/libRobert Speicher2015-06-148-53/+84
|
* Update spec/features/security specsRobert Speicher2015-06-142-43/+26
|
* Only require email_spec in the one place it's usedRobert Speicher2015-06-142-1/+1
|
* Update email_spec gemRobert Speicher2015-06-142-4/+4
| | | | This fixes spec/mailers/notify_spec
* Fix syntax for spec/models/project_services/Robert Speicher2015-06-1410-25/+23
|
* Update mock syntax for files in spec/helpersRobert Speicher2015-06-148-36/+44
|
* Update expect syntax for AutocompleteController specRobert Speicher2015-06-141-3/+3
| | | | Everything in spec/controllers now passes without issue.
* Update and simplify Import controller specsRobert Speicher2015-06-146-36/+75
|
* Fix include_module matcherRobert Speicher2015-06-141-1/+5
|
* Fixed some errors in features/project/source/multiselect_blob testJeroen van Baarsen2015-06-141-1/+2
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fixed features/snippets spinach testsJeroen van Baarsen2015-06-141-1/+1
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fixed features/dashboard spinach testJeroen van Baarsen2015-06-141-1/+1
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fixed the features/profile spinach testsJeroen van Baarsen2015-06-141-4/+8
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fixed the features/search.feature specsJeroen van Baarsen2015-06-141-3/+9
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Made some more progress towards rspec 3Jeroen van Baarsen2015-06-143-13/+23
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fixed comments feature testsJeroen van Baarsen2015-06-144-10/+15
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* --wip--Jeroen van Baarsen2015-06-142-3/+3
|
* Fixed broken feature testJeroen van Baarsen2015-06-141-3/+3
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-142-3/+3
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-144-15/+18
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1418-77/+75
|\
| * Merge branch 'rs-issue-1432' into 'master'Dmitriy Zaporozhets2015-06-142-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | Update Redcarpet to 3.3.0 Fixes #1432 See merge request !809
| | * Update Redcarpet to 3.3.0rs-issue-1432Robert Speicher2015-06-132-3/+3
| | | | | | | | | | | | Fixes #1432
| * | Merge branch 'rs-expect-syntax-specs' into 'master'Dmitriy Zaporozhets2015-06-1416-74/+72
| |\ \ | | |/ | |/| | | | | | | | | | Prepare specs for RSpec 3 See merge request !811
| | * Use `page.all` and `page.within` in specsrs-expect-syntax-specsRobert Speicher2015-06-134-20/+20
| | |
| | * Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher2015-06-1313-48/+46
| | |
| | * Change `foo.should_not` syntax to `expect(foo).not_to` in specsRobert Speicher2015-06-134-6/+6
| |/
* | Merge pull request #9340 from jvanbaarsen/update-noteableDmitriy Zaporozhets2015-06-143-2/+6
|\ \ | |/ |/| Update noteable after a new note is added
| * Update noteable after a new note is addedJeroen van Baarsen2015-06-053-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It makes sure that whenever a new note is added to an noteable item, the updated_at of that item is also updated. **Why is this needed?** At this moment when you post a comment on an issue or add a label to an issue, the updated_at is not changed. Because of this the filtering for least recently updated is not really useful (since it only takes in account the original text from the noteable). Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Merge branch 'rs-issue-1798' into 'master'Dmitriy Zaporozhets2015-06-133-12/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | Ensure `session_expire_delay` field exists before accessing it Closes #1798 See merge request !808
| * | Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-133-12/+12
|/ / | | | | | | Closes #1798
* | Merge branch 'regex-anchor-docs' into 'master'Sytse Sijbrandij2015-06-121-0/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | Add info about regex anchors to shell command docs. Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-ee/issues/263. See merge request !805
| * | Add info about regex anchors to shell command docs.Douwe Maan2015-06-121-0/+30
|/ /
* | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-1210-4/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add session expiration delay configuration through UI application Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting) Answers the following suggestions: * http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable * http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle See merge request !774
| * | session_expire_seconds => session_expire_delaythemaze752015-06-1010-16/+25
| | | | | | | | | | | | | | | delay is in seconds more legible code in session_store Added `GitLab restart required` help block to session_expire_delay
| * | Add session expiration delay configuration through UI applicationEric Maziade2015-06-0510-4/+21
| | | | | | | | | settings
* | | Merge branch 'update-guides-7.12' into 'master'Jacob Vosmaer2015-06-122-10/+144
|\ \ \ | | | | | | | | | | | | | | | | | | | | Add 7.12 update guides See merge request !1858
View Lorry Controller Status