| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Removes `Repository#version` method and testsdz-remove-repo-version | Dmitriy Zaporozhets | 2017-04-17 | 1 | -6/+0 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Clear emoji search in awards menu after picking emoji27655-clear-emoji-search-after-selection | Eric Eastwood | 2017-04-13 | 1 | -3/+3 |
| | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27655 | ||||
| * | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-07 | 2 | -1/+10 |
| |\ | |||||
| | * | Merge branch 'dm-wait-for-pipeline' into 'master' | Stan Hu | 2017-04-07 | 1 | -0/+9 |
| | |\ | | | | | | | | | | | | | | | | | | | Wait for AJAX requests to complete so they don't blow up if they are only handle… Closes #30633 See merge request !10559 | ||||
| | | * | Actually include WaitForAjax! | Douwe Maan | 2017-04-07 | 1 | -0/+1 |
| | | | | |||||
| | | * | Wait for AJAX requests to complete so they don't blow up if they are only ↵ | Douwe Maan | 2017-04-07 | 1 | -0/+8 |
| | | | | | | | | | | | | | handled after DatabaseCleaner has already run | ||||
| | * | | Put back usernames in activity and profile feed | Annabel Dunstone Gray | 2017-04-07 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 1 | -1/+2 |
| |\ \ | |/ | |||||
| | * | Update project build status cache when transitioning | Bob Van Landuyt | 2017-04-07 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 21 | -55/+67 |
| |\ \ | |/ | |||||
| | * | Merge branch 'menu-shortcut' into 'master' | Jacob Schatz | 2017-04-06 | 2 | -3/+3 |
| | |\ | | | | | | | | | | | | | | | | | | | Add keyboard shortcuts to main menu. Closes #30036 See merge request !10243 | ||||
| | | * | Fix broken spinach test | Filipa Lacerda | 2017-04-06 | 1 | -2/+2 |
| | | | | |||||
| | | * | Fix shortcut specs | Annabel Dunstone Gray | 2017-04-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed button capitalisation for Projects in views | Jose Ivan Vargas Lopez | 2017-04-06 | 15 | -36/+48 |
| | | | | |||||
| | * | | Fix rspec and spinach tests | Jose Ivan Vargas | 2017-04-06 | 3 | -12/+12 |
| | | | | |||||
| | * | | Groups section capitalization fix | Jose Ivan Vargas Lopez | 2017-04-06 | 1 | -2/+2 |
| | | | | |||||
| | * | | Dashboard section capitalization fix | Jose Ivan Vargas Lopez | 2017-04-06 | 1 | -2/+2 |
| | |/ | |||||
| * | | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-06 | 5 | -4/+18 |
| |\ \ | |/ | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml | ||||
| | * | Merge branch '29128-profile-page-icons' into 'master' | Filipa Lacerda | 2017-04-06 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | Resolve "Add system note icons to profile page" Closes #29128 See merge request !10387 | ||||
| | | * | Update commit icon; fix specs29128-profile-page-icons | Annabel Dunstone Gray | 2017-04-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Linking to edit file directly | Eric Eastwood | 2017-04-06 | 2 | -1/+15 |
| | | | | |||||
| | * | | Optimise trace handling code to use streaming instead of full read | Kamil Trzciński | 2017-04-06 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fix some specs | Douwe Maan | 2017-04-05 | 1 | -0/+3 |
| |/ / | |||||
| * | | Merge branch 'sh-fix-award-emoji-transient-spec' into 'master' | Rémy Coutable | 2017-04-05 | 1 | -1/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | Potential fix for intermittent spec failure in award emoji specs Closes #30399 See merge request !10476 | ||||
| | * | | Potential fix for intermittent spec failure in award emoji specssh-fix-award-emoji-transient-spec | Stan Hu | 2017-04-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | Hover and then click seems to make this work more reliably. Closes #30399 | ||||
| * | | | MR empty state | Luke "Jared" Bennett | 2017-04-05 | 6 | -7/+13 |
| |/ / | |||||
| * | | Merge branch 'rc/fix-spinach-plus-knapsack-properly' into 'master' | Robert Speicher | 2017-04-04 | 2 | -7/+0 |
| |\ \ | | | | | | | | | | | | | Fix a Knapsack issue that would load support/capybara.rb before support/env.rb See merge request !10430 | ||||
| | * | | Fix a Knapsack issue that would load support/capybara.rb before support/env.rbrc/fix-spinach-plus-knapsack-properly | Rémy Coutable | 2017-04-04 | 2 | -7/+0 |
| | |/ | | | | | | | | | | | | | | | 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> | ||||
| * | | Don't use FFaker in factories, use sequences instead | Rémy Coutable | 2017-04-03 | 1 | -2/+2 |
| |/ | | | | | | | 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> | ||||
| * | Add a wait_for_ajax call to ensure Todos page cleans up properlysh-fix-todos-spinach-failure | Stan Hu | 2017-04-02 | 1 | -0/+3 |
| | | | | | Potentially fixes intermittent failures such as https://gitlab.com/gitlab-org/gitlab-ce/builds/13484375 | ||||
| * | Fix Spinach and Capybara dependencies | Stan Hu | 2017-04-01 | 1 | -1/+3 |
| | | | | | Closes #30347 | ||||
| * | Properly eagerly-load the Capybara server for JS feature specs only | Rémy Coutable | 2017-03-31 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Eager-load the Capybara server to prevent timeouts | Rémy Coutable | 2017-03-31 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Increase Capybara's timeout | Rémy Coutable | 2017-03-31 | 1 | -1/+1 |
| | | | | | | | | | 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> | ||||
| * | Merge branch 'rs-spinach-reporter' into 'master' | Rémy Coutable | 2017-03-30 | 1 | -0/+16 |
| |\ | | | | | | | | | Monkey patch the Spinach StdoutReporter to show scenario locations See merge request !10321 | ||||
| | * | Monkey patch the Spinach StdoutReporter to show scenario locations | Robert Speicher | 2017-03-29 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Merge branch '23674-simplify-milestone-summary' into 'master' | Jacob Schatz | 2017-03-29 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Resolve "Simplify milestone summary" Closes #23674 See merge request !10096 | ||||
| | * | | update milestone page tests | Mike Greiling | 2017-03-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add shortcuts and counters to MRs and issues in navbar | Annabel Dunstone Gray | 2017-03-29 | 1 | -3/+3 |
| | |/ |/| | |||||
| * | | Fix link togglers jumping to top | Eric Eastwood | 2017-03-28 | 2 | -2/+2 |
| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29414 | ||||
| * | | Fix up emoji tests that should have failed :/ | Eric Eastwood | 2017-03-24 | 4 | -5/+5 |
| |/ | | | | | | | 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 | ||||
| * | Merge branch 'add-blob-copy-button' into 'master' | Robert Speicher | 2017-03-16 | 1 | -2/+2 |
| |\ | | | | | | | | | Add copy button to blob header and use icon for Raw button See merge request !9878 | ||||
| | * | Fix specadd-blob-copy-button | Douwe Maan | 2017-03-16 | 1 | -2/+2 |
| | | | |||||
| | * | Fix spec | Douwe Maan | 2017-03-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'pages-multiple-ips-doc' into 'master' | Kamil Trzciński | 2017-03-16 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | The GitLab Pages external-http and external-https arguments can be specified multiple times See merge request !9812 | ||||
| | * | | The GitLab Pages external-http and external-https arguments can be specified ↵ | Nick Thomas | 2017-03-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | multiple times | ||||
| * | | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' | Filipa Lacerda | 2017-03-16 | 1 | -1/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Undo mark all as done' to Todos Closes #27114 See merge request !9890 | ||||
| | * | | | Add 'Undo mark all as done' to Todos | Jacopo | 2017-03-16 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Adds pipeline mini-graph to system information box in Commit View | Filipa Lacerda | 2017-03-16 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | Merge branch 'rs-capybara-screenshot-artifacts' into 'master' | Kamil Trzciński | 2017-03-14 | 1 | -6/+3 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Store capybara screenshots as build artifacts Closes #13971 See merge request !7985 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |