| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'fix-flakey-remove-deploy-key-spec' into 'master' | Rémy Coutable | 2018-06-15 | 1 | -1/+2 |
| |\ | | | | | | | | | Fix flakey time-sensitive remove deploy key spec See merge request gitlab-org/gitlab-ce!19800 | ||||
| | * | Fix flakey time-sensitive remove deploy key specfix-flakey-remove-deploy-key-spec | Eric Eastwood | 2018-06-14 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'fix-flakey-user-assignee-autocomplete-dropdown-specs' into ↵ | Douwe Maan | 2018-06-15 | 1 | -25/+26 |
| |\ \ | | | | | | | | | | | | | | | | | | | 'master' Fix flakey time-sensitive user/assignee autocomplete dropdown See merge request gitlab-org/gitlab-ce!19799 | ||||
| | * | | Update dropdown_assignee_spec with filtered_search_helpersfix-flakey-user-assignee-autocomplete-dropdown-specs | Eric Eastwood | 2018-06-14 | 1 | -19/+18 |
| | | | | |||||
| | * | | Fix flakey user/assignee autocomplete dropdown | Eric Eastwood | 2018-06-14 | 1 | -8/+10 |
| | |/ | | | | | | | | | | | | | | | | | Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/38664 This previously worked because, it would assert the correct names in the full list and then wait for the list to go blank for the NOT assertion Example failure, https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/74649299 | ||||
| * | | Resolve ""Click to expand" link in collapsed diffs should be blue" | Annabel Gray | 2018-06-14 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'fix-flakey-user-comment-on-issue' into 'master' | Sean McGivern | 2018-06-14 | 1 | -2/+5 |
| |\ \ | | | | | | | | | | | | | Fix flakey time-sensitive user comment on issue test See merge request gitlab-org/gitlab-ce!19786 | ||||
| | * | | Fix flakey user comment on issue test race condition | Eric Eastwood | 2018-06-14 | 1 | -2/+5 |
| | |/ | |||||
| * | | enable CommonMark as the default | Brett Walker | 2018-06-14 | 3 | -20/+89 |
| |/ | |||||
| * | Resolve "Add `/confidential` quick action for issues" | Jan | 2018-06-13 | 1 | -0/+36 |
| | | |||||
| * | Don't use Gitlab::Utils.nlbr in Gitlab::Git | Jacob Vosmaer (GitLab) | 2018-06-11 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'rs-update-rspec' into 'master' | Rémy Coutable | 2018-06-11 | 5 | -8/+7 |
| |\ | | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449 | ||||
| | * | Correct more usages of non-relative `fixture_file_upload` paths | Robert Speicher | 2018-06-07 | 1 | -2/+1 |
| | | | |||||
| | * | Make all uses of `fixture_file_upload` use relative paths | Robert Speicher | 2018-06-07 | 4 | -6/+6 |
| | | | |||||
| * | | Users can accept terms during registration | Bob Van Landuyt | 2018-06-08 | 3 | -69/+97 |
| | | | | | | | | | | | | | | | | | | | | | When a user checks the `accept` checkbox, we will track that acceptance as usual. That way they don't need to accept again after they complete the registration. When an unauthenticated user visits the `/-/users/terms` page, there is no button to accept, decline or continue. The 'current-user menu' is also hidden from the top bar. | ||||
| * | | Backport of "Add assignee lists to boards" | Mario de la Ossa | 2018-06-07 | 2 | -1/+4 |
| | | | |||||
| * | | Merge branch '47182-use-the-default-strings-of-timeago-js' into 'master' | Clement Ho | 2018-06-07 | 2 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | Use the default strings of timeago.js for timeago Closes #47182 See merge request gitlab-org/gitlab-ce!19350 | ||||
| | * | | Use the default strings of timeago.js for timeago | Takuya Noguchi | 2018-06-04 | 2 | -2/+2 |
| | | | | |||||
| * | | | Resolve "Show `failure_reason` and improve failed jobs tab in pipeline ↵ | André Luís | 2018-06-07 | 1 | -0/+10 |
| | | | | | | | | | | | | | detail view" | ||||
| * | | | Merge branch 'feature/customizable-favicon' into 'master' | Douwe Maan | 2018-06-07 | 2 | -1/+21 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497 | ||||
| | * | | allow only png, ico for favicon uploads | Alexis Reigel | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | the related omnibus graphicsmagick package only supports those formats. see https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1975 | ||||
| | * | | remove favicon preview on appearance page | Alexis Reigel | 2018-06-05 | 1 | -3/+2 |
| | | | | |||||
| | * | | remove all .ico favicon variations, use png always | Alexis Reigel | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | the ci status icons are generated client side, wo we don't need the static files anymore. | ||||
| | * | | create favicon overlay on the client | Alexis Reigel | 2018-06-05 | 1 | -23/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the initial reason for this change was that graphicsmagick does not support writing to ico files. this fact lead to a chain of changes: 1. use png instead of ico (browser support is good enough) 2. render the overlays on the client using the canvas API. this way we only need to store the original favion and generate the overlay versions dynamically. this change also enables (next step) to simplify the handling of the stock favicons as well, as we don't need to generate all the versions upfront. | ||||
| | * | | whitelist allowed file types for custom favicons | Alexis Reigel | 2018-06-05 | 1 | -0/+6 |
| | | | | |||||
| | * | | feature spec for managing appearance > favicon | Alexis Reigel | 2018-06-05 | 1 | -0/+34 |
| | | | | |||||
| * | | | Merge branch 'master' into ↵ | Luke Bennett | 2018-06-07 | 4 | -10/+10 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | '39549-label-list-page-redesign-with-draggable-labels' # Conflicts: # app/views/projects/labels/index.html.haml | ||||
| | * | | | group runners | Mark Chao | 2018-06-06 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | Fix spec | Mark Chao | 2018-06-06 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Rename “Developers + Masters” | Mark Chao | 2018-06-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into ↵ | Luke Bennett | 2018-06-06 | 5 | -121/+129 |
| |\ \ \ \ | |/ / / | | | | | | | | | 39549-label-list-page-redesign-with-draggable-labels | ||||
| | * | | | Combine multiple `it` blocks to improve Markdown feature spec times | Robert Speicher | 2018-06-05 | 1 | -107/+97 |
| | | | | | | | | | | | | | | | | | | | | | The setup of each spec is too expensive to perform as many times as we were doing it. Reduced duration from 255 seconds to 43. | ||||
| | * | | | Find and mark more Git disk access locations | Jacob Vosmaer (GitLab) | 2018-06-05 | 1 | -2/+4 |
| | | | | | |||||
| | * | | | Merge branch '46585-gdpr-terms-acceptance' into 'master' | Robert Speicher | 2018-06-05 | 1 | -0/+16 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Missing Accept button for terms of service" Closes #46585 See merge request gitlab-org/gitlab-ce!19156 | ||||
| | | * | | | Messaging on terms page when user already accepted46585-gdpr-terms-acceptance | tauriedavis | 2018-06-04 | 1 | -0/+16 |
| | | | |/ | | |/| | | | | | | | | | | | | | We show a blue flash banner if the user already accepted, and show a button allowing them to continue to the application. | ||||
| | * | | | Merge branch '42751-rename-mr-maintainer-push' into 'master' | Robert Speicher | 2018-06-05 | 2 | -12/+12 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061 | ||||
| | | * | | Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-push | Mark Chao | 2018-06-01 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751 | ||||
| * | | | | Merge remote-tracking branch 'origin/master' into ↵ | Luke Bennett | 2018-06-05 | 1 | -2/+0 |
| |\ \ \ \ | |/ / / | | | | | | | | | 39549-label-list-page-redesign-with-draggable-labels | ||||
| | * | | | Remove unused running_or_pending_build_countremove-unused-query-in-hooks | Kamil Trzciński | 2018-06-04 | 1 | -2/+0 |
| | | |/ | |/| | |||||
| * | | | Merge remote-tracking branch 'origin/master' into ↵ | Luke Bennett | 2018-06-05 | 45 | -233/+723 |
| |\ \ \ | |/ / | | | | | | | 39549-label-list-page-redesign-with-draggable-labels | ||||
| | * | | Merge branch '46010-add-more-validations-for-runners-and-runner-type' into ↵ | Kamil Trzciński | 2018-06-01 | 2 | -24/+22 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve validations for Ci::Runner#runner_type See merge request gitlab-org/gitlab-ce!18901 | ||||
| | | * | | Fix spec/features/runners_spec.rb | Dylan Griffith | 2018-05-31 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Refactor validations and make runner factory by default to be instance-wide ↵ | Kamil Trzciński | 2018-05-31 | 2 | -14/+12 |
| | | | | | | | | | | | | | | | | | runner | ||||
| | | * | | Improve runner_type validations for Ci::Runner | Dylan Griffith | 2018-05-31 | 2 | -12/+12 |
| | | | | | |||||
| | * | | | Merge branch '47046-use-sortable-from-npm' into 'master' | Phil Hughes | 2018-06-01 | 1 | -3/+4 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Use NPM provided version of SortableJS Closes #47046 See merge request gitlab-org/gitlab-ce!19274 | ||||
| | | * | | Make simulateDrag duration configurable | Kushal Pandya | 2018-05-31 | 1 | -3/+4 |
| | | |/ | |||||
| | * | | Update 404 and 403 pages | Paul Slaughter | 2018-05-31 | 2 | -1/+43 |
| | | | | |||||
| | * | | Fix active tab styling | Annabel Gray | 2018-05-31 | 1 | -4/+4 |
| | | | | |||||
| | * | | Export assigned issues in iCalendar feed | Imre Farkas | 2018-05-31 | 23 | -63/+278 |
| | |/ | |||||
| | * | Simplify spec: `2.times.each` -> `2.times` | Stan Hu | 2018-05-30 | 1 | -1/+1 |
| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |