| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge branch 'gitaly-socket-per-shard' into 'master' | Sean McGivern | 2017-03-29 | 3 | -21/+46 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | One Gitaly connection per storage shard See merge request !10150 | |||||
| | | * | | | Change socket_path to gitaly_address | Jacob Vosmaer | 2017-03-29 | 2 | -11/+25 | |
| | | | | | | ||||||
| | | * | | | Expand relative paths in storages | Jacob Vosmaer | 2017-03-29 | 1 | -10/+19 | |
| | | | | | | ||||||
| | | * | | | Separate GRPC channels per repository storage | Jacob Vosmaer | 2017-03-29 | 2 | -2/+4 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'ipython-notebook-viewer' into 'master' | Jacob Schatz | 2017-03-28 | 1 | -0/+2 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | iPython notebook viewer See merge request !10017 | |||||
| | | * | | | | Started iPython notebook viewer | Phil Hughes | 2017-03-23 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using NotebookLab library [ci skip] | |||||
| | * | | | | | Merge branch 'fix/gb/environments-folders-route' into 'master' | Kamil Trzciński | 2017-03-28 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix environment folder route when special chars present Closes #29922 See merge request !10250 | |||||
| | | * | | | | Fix environment folder route when special chars present | Grzegorz Bizon | 2017-03-27 | 1 | -1/+1 | |
| | | | |/ / | | |/| | | ||||||
| | * | | | | spread out webpack bundles per-line to reduce conflicts in EE | Mike Greiling | 2017-03-27 | 1 | -1/+5 | |
| | | | | | | ||||||
| | * | | | | Merge branch '29787-monitor-ee-rspec-tests-separately' into 'master' | Sean McGivern | 2017-03-27 | 1 | -1/+5 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Consider tracking the EE test suite with `rspec_profiling`" Closes #29787 See merge request !10226 | |||||
| | | * | | | | RSpec profiling: Prepend the branch name with `ce` or `ee` | Rémy Coutable | 2017-03-24 | 1 | -1/+5 | |
| | | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| | * | | | | Merge branch ↵ | Kamil Trzciński | 2017-03-27 | 1 | -0/+2 | |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | '12818-expose-simple-cicd-status-endpoints-with-status-serializer-gitlab-ci-status-for-pipeline-job-and-merge-request' into 'master' Expose CI/CD status API endpoints with Gitlab::Ci::Status facility on pipeline, job and merge request for favicon See merge request !9561 | |||||
| | | * | | | Rename endpoints 'status' to 'pipeline_status' in merge_requests | Shinya Maeda | 2017-03-23 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Expose only status. ci_cd_status to status. Support abstract class. | Shinya Maeda | 2017-03-23 | 1 | -3/+2 | |
| | | | | | | ||||||
| | | * | | | Add api points for ci cd status. Add favicon. | Shinya Maeda | 2017-03-23 | 1 | -0/+3 | |
| | | |/ / | ||||||
| * | | | | Move code related to registry to multiple controllers | Grzegorz Bizon | 2017-03-31 | 1 | -0/+6 | |
| | | | | | ||||||
| * | | | | Reorganize container repository controllers and views | Grzegorz Bizon | 2017-03-31 | 1 | -1/+4 | |
| |/ / / | ||||||
| * | | | Merge branch 'refactor-templates-js' into 'master' | Alfredo Sumaran | 2017-03-24 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | | Refactor template selector JavaScript See merge request !9792 | |||||
| | * | | | Lightly refactor js files related to file template selectors. | Bryce Johnson | 2017-03-22 | 1 | -1/+1 | |
| | |/ / | ||||||
| * | | | Introduce a new middleware for the test environment that can block requests | Rémy Coutable | 2017-03-22 | 1 | -0/+3 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | The idea is that after each feature spec example, we block all incoming requests at the Rack level, go to the 'about:blank' page, and wait until the current requests reach 0. This should solve the problem where a request would end after database cleaner performed the database truncation. The problem was that a GET request can still lead to records creation (e.g. namespaces or routes). Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | move common vue script to vue_shared directory | Mike Greiling | 2017-03-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | utilize ES module distribution for Vue in webpack | Mike Greiling | 2017-03-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | disable the Vue production warning in development and testing | Mike Greiling | 2017-03-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add gitaly source installation instructions | Jacob Vosmaer | 2017-03-21 | 1 | -1/+1 | |
| |/ | ||||||
| * | Only add frontend code coverage instrumentation when generating coverage report | Mike Greiling | 2017-03-20 | 2 | -25/+15 | |
| | | ||||||
| * | Removed d3.js from the main application.js bundle | Jose Ivan Vargas Lopez | 2017-03-20 | 1 | -1/+2 | |
| | | ||||||
| * | Added Gitlab::Database.config | Yorick Peterse | 2017-03-17 | 1 | -1/+1 | |
| | | | | | | | | | This returns the ActiveRecord configuration for the current environment. While CE doesn't use this very often, EE will use it in a few places for the database load balancing code. I'm adding this to CE so we don't end up with merge conflicts in this file. | |||||
| * | Merge branch 'pages-multiple-ips-doc' into 'master' | Kamil Trzciński | 2017-03-16 | 2 | -4/+4 | |
| |\ | | | | | | | | | 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 | 2 | -4/+4 | |
| | | | | | | | | | multiple times | |||||
| * | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' | Filipa Lacerda | 2017-03-16 | 1 | -0/+1 | |
| |\ \ | | | | | | | | | | | | | | | | | | | 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 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | Merge branch 'fix-legacy-emojis-using-unicode-file-name' into 'master' | Sean McGivern | 2017-03-16 | 1 | -0/+2 | |
| |\ \ \ | | | | | | | | | | | | | | | | | Restore unicode file name images for legacy img emojis See merge request !9986 | |||||
| | * | | | Restore unicode-file-name images for legacy img emojisfix-legacy-emojis-using-unicode-file-name | Eric Eastwood | 2017-03-16 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'remove-es6-extension-configuration' into 'master' | Filipa Lacerda | 2017-03-16 | 2 | -3/+3 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove remaining references to .es6 file extension in our config files and documentation See merge request !9980 | |||||
| | * | | | | remove all references to the .es6 in our config files and documentationremove-es6-extension-configuration | Mike Greiling | 2017-03-15 | 2 | -3/+3 | |
| | |/ / / | ||||||
| * | | | | Futher rename the CI variableszj-rename-ci-vars | Z.J. van de Weg | 2017-03-16 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge branch 'remove-satellites' into 'master' | Douwe Maan | 2017-03-14 | 1 | -10/+0 | |
| |\ \ \ | | | | | | | | | | | | | | | | | Remove unused satellites config See merge request !9919 | |||||
| | * | | | Remove unused satellites config | Stan Hu | 2017-03-13 | 1 | -10/+0 | |
| | |/ / | | | | | | | | | | | | | Note that the old migrations depend on 1_settings.rb, so we can't quite remove those completely. | |||||
| * | | | Merge branch '29389-fix-already-initialized-constants' into 'master' | Robert Speicher | 2017-03-14 | 2 | -9/+6 | |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Remove explicit `require` calls, and use `require_dependency` when needed Closes #29389 See merge request !9899 | |||||
| | * | | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constants | Rémy Coutable | 2017-03-13 | 2 | -9/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | See http://guides.rubyonrails.org/autoloading_and_reloading_constants.html for more info. Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' | Douwe Maan | 2017-03-13 | 2 | -8/+13 | |
| |\ \ \ | |/ / |/| | | | | | | | | Create a new issue for a single discussion See merge request !8266 | |||||
| | * | | Don't instrument `app/services/concerns` | Bob Van Landuyt | 2017-03-13 | 1 | -7/+11 | |
| | | | | ||||||
| | * | | Move `ResolveDiscussions` into `concerns/issues` folder | Bob Van Landuyt | 2017-03-13 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Merge branch 'backport-cache-middleware-fix' into 'master' | Rémy Coutable | 2017-03-13 | 1 | -0/+24 | |
| |\ \ \ | |/ / |/| | | | | | | | | Backport cache middleware fix See merge request !9867 | |||||
| | * | | Try out the monkey patch to fix the middlewarebackport-cache-middleware-fix | Lin Jen-Shin | 2017-03-11 | 1 | -0/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | which isn't properly cleaning up whenever something is thrown, not raised. See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1402#note_25128108 | |||||
| * | | | Execute inflections initializer earlierfix/execute-inflections-initializer-early | Douglas Barbosa Alexandre | 2017-03-10 | 1 | -0/+0 | |
| |/ / | ||||||
| * | | Merge branch 'enable-snippets-by-default' into 'master' | Douwe Maan | 2017-03-10 | 2 | -2/+2 | |
| |\ \ | | | | | | | | | | | | | | | | | | | Enable snippets for new projects by default Closes #28192 See merge request !9857 | |||||
| | * | | Enable snippets for new projects by defaultenable-snippets-by-default | Sean McGivern | 2017-03-10 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change. | |||||
| * | | | Document gitaly.socket_path setting | Jacob Vosmaer | 2017-03-10 | 1 | -0/+10 | |
| |/ / | ||||||
| * | | Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master' | Filipa Lacerda | 2017-03-09 | 1 | -2/+1 | |
| |\ \ | | | | | | | | | | | | | Update emojis to use harmony modules (import/export) See merge request !9784 | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |