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 | 19 | -47/+59 |
|\ \ | |/ | |||||
| * | Merge branch 'menu-shortcut' into 'master' | Jacob Schatz | 2017-04-06 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Add keyboard shortcuts to main menu. Closes #30036 See merge request !10243 | ||||
| | * | Fix broken spinach test | Filipa Lacerda | 2017-04-06 | 1 | -2/+2 |
| | | | |||||
| * | | 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 | 2 | -5/+5 |
| | | | |||||
| * | | 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 | 4 | -4/+14 |
|\ \ | |/ | | | | | | | | | # 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 | 1 | -1/+11 |
| | | | |||||
| * | | 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 | 4 | -4/+7 |
|/ / | |||||
* | | 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 | ||||
* | 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 |
|/ / | |||||
* | | Do not show LFS object when LFS is disabled | Christopher Bartz | 2017-03-13 | 1 | -0/+1 |
| | | | | | | | | | | | | Do not display a 404, when a user tries to retrieve the raw content of an LFS file (pointer) if the config option "lfs_enabled" is set to false. Instead, display the LFS pointer file directly. | ||||
* | | New file from interface on existing branch | Jacopo | 2017-03-13 | 1 | -1/+4 |
|/ | | | | | | Now you can create a new file and select a target_branch != source_branch. If the file that you want to create already exists on the target branch an error message is shown A glDropdown is used to select and create a new branch instead of a text field. | ||||
* | Removed the settings gear button inside the Project to a tab | Jose Ivan Vargas | 2017-03-07 | 2 | -15/+19 |
| | |||||
* | Merge branch 'master' into ↵26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages | Phil Hughes | 2017-03-07 | 4 | -2/+35 |
|\ | | | | | | | 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages | ||||
| * | Merge branch '26371-native-emojis-v3' into 'master' | Filipa Lacerda | 2017-03-07 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569 | ||||
| | * | Use native unicode emojis | Eric Eastwood | 2017-03-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474 | ||||
| * | | Restore keyboard shortcuts for "Activity" and "Charts" | Kushal Pandya | 2017-03-06 | 3 | -1/+34 |
| |/ | |||||
* | | Fixed tests, changed dispatcher routing to the 'repository:show' | Jose Ivan Vargas | 2017-03-06 | 2 | -5/+7 |
|/ | | | | | Also modified the render calls to the deploy_keys and protected_branches partials | ||||
* | Merge branch 'dashboard-filter-search-keep-params' into 'master' | Dmitriy Zaporozhets | 2017-03-04 | 2 | -3/+7 |
|\ | | | | | | | | | | | | | Fixes filtering by name reseting archive filter Closes #28007 See merge request !9625 | ||||
| * | Improve explore projects spinach test | Dmitriy Zaporozhets | 2017-03-04 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | Project name "Internal" is too generic and can lead to false positive/negative when there is a visibility filter on the page. So we ensure we check for project inside list holder css class. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |