| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different ↵27551-use-dev-mirror-of-gitlab-git-test-on-dev | Rémy Coutable | 2017-03-14 | 1 | -3/+3 |
| | | | | | | | | | gitlab-git-test repo We will set this to the dev mirror in GitLab CE and EE on dev. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | 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 | ||||
| | * | Don't disable capybara-screenshot in CI environmentrs-capybara-screenshot-artifacts | Robert Speicher | 2016-12-08 | 1 | -6/+3 |
| | | | |||||
| * | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' | Douwe Maan | 2017-03-13 | 2 | -0/+56 |
| |\ \ | | | | | | | | | | | | | Create a new issue for a single discussion See merge request !8266 | ||||
| | * | | Rename variable | Bob Van Landuyt | 2017-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of | ||||
| | * | | Add a flash messages when an issue resolving discussions is created | Bob Van Landuyt | 2017-03-13 | 1 | -0/+10 |
| | | | | |||||
| | * | | Always require MR-iid for resolving discussions | Bob Van Landuyt | 2017-03-13 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API. | ||||
| | * | | Delegate a single discussion to a new issue | Bob Van Landuyt | 2017-03-13 | 2 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue. | ||||
| * | | | Implement `json_response` as a `let` variable | Rémy Coutable | 2017-03-13 | 2 | -4/+9 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not a good idea to memoize `json_response` using an instance variable because `rspec-retry` doesn't clear instance variables on retries, only `let` variables. This will avoid issues where retries would fail on a different line that the original failure, blurrying what's the real failure. Also, automatically add api: true to specs under /spec/requests/(ci/)?api/, and include JsonHelpers in controller, request and API specs. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Decrease Capybara timeout for CI environmentrs-lower-capybara-timeout | Robert Speicher | 2017-03-08 | 1 | -1/+1 |
| | | | |||||
| * | | Prevent visual token dropdown from opening the wrong filter dropdownfix-visual-tokens | Clement Ho | 2017-03-08 | 1 | -3/+8 |
| | | | |||||
| * | | Add filtered search visual tokensfiltered-search-visual-tokens | Clement Ho | 2017-03-07 | 1 | -2/+34 |
| | | | |||||
| * | | Added Prometheus Service and Prometheus graphs | Kamil Trzciński | 2017-03-07 | 1 | -0/+117 |
| | | | |||||
| * | | Merge branch '28447-hybrid-repository-storages' into 'master' | Sean McGivern | 2017-03-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597 | ||||
| | * | | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility | ||||
| * | | | Fix time tracking endpoints for API v4 | Timothy Andrew | 2017-03-07 | 1 | -0/+128 |
| | | | | | | | | | | | | | | | | | | | - Use issue/merge_request IID instead of ID - Duplicate the original `TimeTrackingEndpoints` concern (+ specs) for V3, since this is a breaking change. | ||||
| * | | | API routes referencing a specific issue should use the issue `iid` | Timothy Andrew | 2017-03-07 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | - As opposed to the issue `id` that was previously being used. - This brings the API routes closer to the web interface's routes. - This is specific to API v4. | ||||
| * | | | Merge branch '26371-native-emojis-v3' into 'master' | Filipa Lacerda | 2017-03-07 | 1 | -3/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569 | ||||
| | * | | | Fix wrong image src with cached gl-emoji and relative root | Eric Eastwood | 2017-03-06 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Use native unicode emojis | Eric Eastwood | 2017-03-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | | | | Change the default CarrierWave root path for tests | Robert Speicher | 2017-03-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This more closely resembles the development and production paths in that paths contain `public/uploads`, rather than `uploads/uploads` as they did before. | ||||
| * | | | | Add Upload model and UploadChecksumWorker worker | Robert Speicher | 2017-03-06 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Cleanup test phases by introducing request_from_ip and operation_from_ip helers | Pawel Chojnacki | 2017-03-06 | 1 | -21/+19 |
| | | | | |||||
| * | | | Make Warden set_user hook validate user ip uniquness | Pawel Chojnacki | 2017-03-06 | 1 | -7/+7 |
| | | | | | | | | | | | | | + rename shared context | ||||
| * | | | Cleanup common code in Unique Ips tests | Pawel Chojnacki | 2017-03-06 | 1 | -5/+36 |
| | | | | |||||
| * | | | Cleanup RSpec tests | Pawel Chojnacki | 2017-03-06 | 1 | -2/+8 |
| | | | | |||||
| * | | | Test various login scenarios if the limit gets enforced | Pawel Chojnacki | 2017-03-06 | 1 | -0/+27 |
| |/ / | |||||
| * | | Merge branch '2629-show-public-rss-feeds-to-anonymous-users' into 'master' | Douwe Maan | 2017-03-02 | 2 | -1/+24 |
| |\ \ | | | | | | | | | | | | | | | | | | | Show public RSS feeds to anonymous users Closes #2629 See merge request !9596 | ||||
| | * | | Show public RSS feeds to anonymous users | Michael Kozono | 2017-02-28 | 2 | -1/+24 |
| | | | | |||||
| * | | | Add internal endpoint to notify post-receive to Gitalygitaly-post-receive | Alejandro Rodríguez | 2017-03-01 | 1 | -0/+3 |
| |/ / | |||||
| * | | Merge branch 'fix-rubocop' into 'master' cherry-picking-regressions-8.17.0 | Robert Speicher | 2017-02-27 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Make RuboCop happy See merge request !9554 | ||||
| | * | | Make RuboCop happyfix-rubocop | Sean McGivern | 2017-02-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'rs-uploaders' into 'master' | Douwe Maan | 2017-02-27 | 1 | -0/+37 |
| |\ \ \ | |/ / |/| | | | | | | | | Minor refactoring of Uploaders See merge request !9490 | ||||
| | * | | Add feature specs for three types of user uploadsrs-uploaders | Robert Speicher | 2017-02-24 | 1 | -0/+37 |
| | | | | |||||
| * | | | Merge branch 'issue_24815' into 'master' | Sean McGivern | 2017-02-27 | 1 | -0/+57 |
| |\ \ \ | | | | | | | | | | | | | | | | | fix ERR_CONTENT_LENGTH_MISMATCH on task checkboxes See merge request !8567 | ||||
| | * | | | Fix issuable stale object error handler for js when updating tasklistsissue_24815 | Felipe Artur | 2017-02-24 | 1 | -0/+57 |
| | | | | | |||||
| * | | | | Rename commit_file, commit_dir and remove_file and update specs | Douwe Maan | 2017-02-24 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Consistently create, update, and delete files, taking CRLF settings into account | Douwe Maan | 2017-02-24 | 1 | -8/+1 |
| | |/ / |/| | | |||||
| * | | | Fix spec | Douwe Maan | 2017-02-24 | 1 | -3/+2 |
| | | | | |||||
| * | | | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-path | Douwe Maan | 2017-02-23 | 3 | -5/+6 |
| | | | | |||||
| * | | | Revert "Enable Style/DotPosition" | Douwe Maan | 2017-02-23 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb | ||||
| * | | | Revert "Prefer leading style for Style/DotPosition" | Douwe Maan | 2017-02-23 | 9 | -94/+94 |
| | | | | | | | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b. | ||||
| * | | | Fix new offenses | Douwe Maan | 2017-02-23 | 2 | -7/+8 |
| | | | | |||||
| * | | | Enable Style/WordArray | Douwe Maan | 2017-02-23 | 1 | -7/+6 |
| | | | | |||||
| * | | | Enable Style/MultilineHashBraceLayout | Douwe Maan | 2017-02-23 | 1 | -6/+7 |
| | | | | |||||
| * | | | Enable Style/ClassCheck | Douwe Maan | 2017-02-23 | 3 | -3/+3 |
| | | | | |||||
| * | | | Prefer leading style for Style/DotPosition | Douwe Maan | 2017-02-23 | 9 | -94/+94 |
| | | | | |||||
| * | | | Fix code for cops | Douwe Maan | 2017-02-23 | 2 | -10/+12 |
| | | | | |||||
| * | | | Enable Style/ConditionalAssignment | Douwe Maan | 2017-02-23 | 2 | -6/+6 |
| | | | | |||||
| * | | | Enable Security/JSONLoad | Douwe Maan | 2017-02-23 | 1 | -1/+1 |
| | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |