Commit Graph

1908 Commits

Author SHA1 Message Date
Douwe Maan d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
Luke "Jared" Bennett 0fc1e04f4c Add renderNote animation and added spec 2017-04-19 19:48:48 +00:00
Dimitrie Hoekstra 3b2adb5bd7 Added profile name to user dropdown 2017-04-19 16:43:57 +00:00
Dmitriy Zaporozhets 27f519a295
Removes `Repository#version` method and tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-04-17 14:07:41 +03:00
Eric Eastwood 0370c7c838 Clear emoji search in awards menu after picking emoji
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27655
2017-04-13 02:22:57 -05:00
Douwe Maan f058b52b50 Merge branch 'master' into new-resolvable-discussion 2017-04-07 20:03:55 -05:00
Stan Hu e2129c9138 Merge branch 'dm-wait-for-pipeline' into 'master'
Wait for AJAX requests to complete so they don't blow up if they are only handle…

Closes #30633

See merge request !10559
2017-04-07 22:33:03 +00:00
Douwe Maan ae65817b92 Actually include WaitForAjax! 2017-04-07 16:59:34 -05:00
Annabel Dunstone Gray 667fa9afa2 Put back usernames in activity and profile feed 2017-04-07 15:59:39 -05:00
Douwe Maan 41f79250b2 Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run 2017-04-07 15:58:56 -05:00
Luke "Jared" Bennett 8b98ca50b3
Merge branch 'master' into new-resolvable-discussion 2017-04-07 21:00:40 +01:00
Bob Van Landuyt 47abf00b24 Update project build status cache when transitioning 2017-04-07 17:24:11 +02:00
Luke "Jared" Bennett 2f22890d42
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion 2017-04-07 12:09:20 +01:00
Jacob Schatz 496208c9bd Merge branch 'menu-shortcut' into 'master'
Add keyboard shortcuts to main menu.

Closes #30036

See merge request !10243
2017-04-06 23:46:14 +00:00
Filipa Lacerda 177c213962 Fix broken spinach test 2017-04-06 18:14:42 -04:00
Annabel Dunstone Gray cde0b27c0b Fix shortcut specs 2017-04-06 18:14:42 -04:00
Douwe Maan 792f6ed16f Merge branch 'master' into new-resolvable-discussion
# Conflicts:
#	app/assets/javascripts/filtered_search/dropdown_hint.js
#	app/views/shared/issuable/_search_bar.html.haml
2017-04-06 15:00:26 -05:00
Jose Ivan Vargas Lopez c380d7669c Fixed button capitalisation for Projects in views 2017-04-06 14:58:57 -05:00
Jose Ivan Vargas 7592137f21 Fix rspec and spinach tests 2017-04-06 14:58:57 -05:00
Jose Ivan Vargas Lopez 0e325ea6ee Groups section capitalization fix 2017-04-06 14:58:57 -05:00
Jose Ivan Vargas Lopez 7997a0df71 Dashboard section capitalization fix 2017-04-06 14:58:57 -05:00
Filipa Lacerda 86d5f1f810 Merge branch '29128-profile-page-icons' into 'master'
Resolve "Add system note icons to profile page"

Closes #29128

See merge request !10387
2017-04-06 16:59:56 +00:00
Eric Eastwood b42dc1a52b Linking to edit file directly 2017-04-06 16:36:38 +00:00
Kamil Trzciński 828d81ee1f Optimise trace handling code to use streaming instead of full read 2017-04-06 16:20:27 +00:00
Douwe Maan 9c30b0e918
Fix some specs 2017-04-05 17:44:14 +01:00
Rémy Coutable 7196adaaa4 Merge branch 'sh-fix-award-emoji-transient-spec' into 'master'
Potential fix for intermittent spec failure in award emoji specs

Closes #30399

See merge request !10476
2017-04-05 14:02:08 +00:00
Luke "Jared" Bennett 7c5198219a MR empty state 2017-04-05 12:43:03 +00:00
Stan Hu 32e2783fb9 Potential fix for intermittent spec failure in award emoji specs
Hover and then click seems to make this work more reliably.

Closes #30399
2017-04-05 03:54:37 -07:00
Robert Speicher b57ed57f6b Merge branch 'rc/fix-spinach-plus-knapsack-properly' into 'master'
Fix a Knapsack issue that would load support/capybara.rb before support/env.rb

See merge request !10430
2017-04-04 07:53:19 +00:00
Rémy Coutable e97d1ae036
Fix a Knapsack issue that would load support/capybara.rb before support/env.rb
Once https://github.com/ArturT/knapsack/issues/57 is solved and released
in a new gem version, we can remove the KNAPSACK_TEST_DIR in
.gitlab-ci.yml.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-04 01:57:41 +02:00
Rémy Coutable 4e3516788f Don't use FFaker in factories, use sequences instead
FFaker can generate data that randomly break our test suite. This
simplifies our factories and use sequences which are more predictive.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-03 18:54:48 +02:00
Annabel Dunstone Gray d4377b8c12 Update commit icon; fix specs 2017-04-03 08:34:36 -05:00
Stan Hu 6bffef880d Add a wait_for_ajax call to ensure Todos page cleans up properly
Potentially fixes intermittent failures such as https://gitlab.com/gitlab-org/gitlab-ce/builds/13484375
2017-04-02 09:11:59 -07:00
Stan Hu c0564c549d Fix Spinach and Capybara dependencies
Closes #30347
2017-04-01 22:49:22 -07:00
Rémy Coutable 2fa5607448
Properly eagerly-load the Capybara server for JS feature specs only
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-31 14:43:36 +02:00
Rémy Coutable f659c406ab Eager-load the Capybara server to prevent timeouts
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-31 11:43:17 +02:00
Rémy Coutable e559283cc0 Increase Capybara's timeout
Also disabled assets warming for Capybara/RSpec and remove a check to
skip assets warming when ./tmp/cache/assets/test exists because assets
are now served by webpack-dev-server.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-31 11:43:17 +02:00
Rémy Coutable 7faafa5ab5 Merge branch 'rs-spinach-reporter' into 'master'
Monkey patch the Spinach StdoutReporter to show scenario locations

See merge request !10321
2017-03-30 12:13:51 +00:00
Jacob Schatz f7fefe82e5 Merge branch '23674-simplify-milestone-summary' into 'master'
Resolve "Simplify milestone summary"

Closes #23674

See merge request !10096
2017-03-29 21:53:10 +00:00
Annabel Dunstone Gray d08d12ae03 Add shortcuts and counters to MRs and issues in navbar 2017-03-29 21:16:57 +00:00
Robert Speicher 9aedf9c42c Monkey patch the Spinach StdoutReporter to show scenario locations
Before:

    Scenario: Viewing invitation when signed out
      ✔  Given "John Doe" is owner of group "Owned" # features/steps/shared/group.rb:8

After:

    Scenario: Viewing invitation when signed out    # features/invites.feature:6
      ✔  Given "John Doe" is owner of group "Owned" # features/steps/shared/group.rb:8

Now if a scenario fails we can easily rerun it with a specific line
number.
2017-03-29 17:07:51 -04:00
Eric Eastwood cf3c43980d Fix link togglers jumping to top
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29414
2017-03-28 11:09:12 -05:00
Mike Greiling 5af7dbe37a update milestone page tests 2017-03-25 00:33:45 -05:00
Eric Eastwood f7d69a74a8 Fix up emoji tests that should have failed :/
Some discussion,
https://gitlab.slack.com/archives/C0GQHHPGW/p1490398531185144
 -> MR to fix failing emoji test:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10230
2017-03-24 21:19:34 -05:00
Robert Speicher 0c8a2edfab Merge branch 'add-blob-copy-button' into 'master'
Add copy button to blob header and use icon for Raw button

See merge request !9878
2017-03-16 23:03:37 +00:00
Kamil Trzciński 8a7c822dcc Merge branch 'pages-multiple-ips-doc' into 'master'
The GitLab Pages external-http and external-https arguments can be specified multiple times

See merge request !9812
2017-03-16 18:38:55 +00:00
Douwe Maan 82cc38d7d8 Fix spec 2017-03-16 09:37:22 -06:00
Douwe Maan c52fead0d2 Fix spec 2017-03-16 09:37:22 -06:00
Filipa Lacerda 774e0e3bfe Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master'
Add 'Undo mark all as done' to Todos

Closes #27114

See merge request !9890
2017-03-16 11:29:10 +00:00
Jacopo 5f9ace8eb1 Add 'Undo mark all as done' to Todos
Added the ability to 'Undo mark all as done' todos marked as complete with 'Mark all as done'
in the 'Todo' tab of the Todo dashboard.
The operation undos only the todo previously marked as done with the 'Mark al as done' button.
2017-03-16 07:15:00 +01:00