Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-07Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets
Migrate from Sidetiq to Sidekiq-cron Migrate from Sidetiq to Sidekiq-cron Updated Sidekiq to 3.5.x This will solve #2355 See merge request !1982
2015-12-05Fix Error 500 when creating global milestones with Unicode charactersStan Hu
Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 Fix constraints
2015-12-04Migrate from Sidetiq to Sidekiq-cronGabriel Mazetto
Updated Sidekiq to 3.5.x
2015-11-30Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov
Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
2015-11-28Bump jquery-turbolinks to ~> 2.1.0Robert Speicher
See #2857
2015-11-26Migrate mailers to ActiveJobValery Sizov
2015-11-26Merge remote-tracking branch 'origin/master' into rails_update_to_4_2Valery Sizov
2015-11-26update test_after_commit gem to 0.4.2Valery Sizov
2015-11-26Merge branch 'rs-remove-enumerize' into 'master' Dmitriy Zaporozhets
Remove enumerize gem Closes #2803 See merge request !1912
2015-11-26Merge branch 'rs-update-asana' into 'master' Dmitriy Zaporozhets
Bump asana to ~> 0.4.0 Closes #2830 See merge request !1911
2015-11-26Remove enumerize gemRobert Speicher
2015-11-26Bump asana to ~> 0.4.0Robert Speicher
Closes #2830
2015-11-26Bump doorkeeper to ~> 2.2.0Robert Speicher
Closes #2746
2015-11-25Rails update to 4.2.4Valery Sizov
2015-11-25Merge branch 'rs-update-colorize' into 'master' Dmitriy Zaporozhets
Bump colorize to ~> 0.7.0 Also removes `colored` which came in during the CI merge and is redundant. Closes #2822 See merge request !1895
2015-11-25Merge branch 'rs-update-rack-oauth2' into 'master' Dmitriy Zaporozhets
Bump rack-oauth2 to ~> 1.2.1 Closes #2748 See merge request !1891
2015-11-25Merge branch 'rs-update-creole' into 'master' Dmitriy Zaporozhets
Bump creole to ~> 0.5.0 Closes #2815 See merge request !1890
2015-11-25Bump colorize to ~> 0.7.0Robert Speicher
Also removes `colored` which came in during the CI merge and is redundant. Closes #2822
2015-11-24Bump rack-oauth2 to ~> 1.2.1Robert Speicher
2015-11-24Bump creole to ~> 0.5.0Robert Speicher
Closes #2815
2015-11-24Bump gon to ~> 6.0.1Robert Speicher
Closes #2856
2015-11-23Merge branch 'bundler-audit' into 'master' Dmitriy Zaporozhets
Add bundler-audit to CI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM @rspeicher @vsizov See merge request !1874
2015-11-23Add bundler-audit to CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-19Updated rails patchFerdinand Rosario
2015-11-11Merge branch 'flay' into 'master' Dmitriy Zaporozhets
Add flay: tool to find duplicate code Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1789
2015-11-11Merge branch 'flog' into 'master' Dmitriy Zaporozhets
Add method complexity check to CI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1783
2015-11-11Add flay: tool to find duplicate codeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-11Merge branch 'artifacts' into 'master' Kamil Trzciński
Implement Build Artifacts This implements #3028 1. It stores artifacts in shared/artifacts, 1. It adds `artifacts` to `.gitlab-ci.yml`, 1. We use GitLab Workhorse to offload artifacts uploading, 1. To download artifacts it uses GitLab Workhorse X-Sendfile extension, 1. There's one "artifact" per-build. The new upload removes previous one and creates a new one, 1. Default max artifact size is set to 100MB - this can be changed in settings. Missing things: 1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files, 1. Artifacts passing between builds. GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5 GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46 Syntax: ``` artifacts: untracked: true # default: false paths: # default: empty - bin/files ``` See merge request !1584
2015-11-10Add method complexity check to CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10Merge branch 'state-machine-to-state-machines-activerecord' into 'master' Dmitriy Zaporozhets
Switch to state_machines-activerecord (Fixes: #3374) state_machine is unmaintained See merge request !1764
2015-11-10Implement Build ArtifactsKamil Trzcinski
- Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
2015-11-09Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3.Stan Hu
Switch back to github-linguist
2015-11-09Added Sherlock, a custom profiling tool for GitLabYorick Peterse
Sherlock will be a new GitLab specific tool for measuring the performance of Rails requests (and SideKiq jobs at some point). Some of the things that are currently tracked: * SQL queries along with their timings, backtraces and query plans (using "EXPLAIN ANALYZE" for PostgreSQL and regular "EXPLAIN" for MySQL) * Timings of application files (including views) on a per line basis * Some meta data such as the request method, path, total duration, etc More tracking (e.g. Rugged or gitlab-shell timings) might be added in the future. Sherlock will replace any existing tools we have used so far (e.g. active_record_query_trace and rack-mini-profiler), hence the corresponding Gems have been removed from the Gemfile. Sherlock can be enabled by starting Rails as following: ENABLE_SHERLOCK=1 bundle exec rails s Recorded transactions can be found at `/sherlock/transactions`.
2015-11-08Switch to state_machines-activerecord (Fixes: #3374)Pirate Praveen
2015-11-04Merge branch 'facebook-auth' into 'master' Robert Speicher
Add Facebook authentication See merge request !1740
2015-11-03Add Facebook authenticationDouwe Maan
2015-11-03Bump stamp to ~> 0.6.0Robert Speicher
Closes #2801
2015-10-28Merge branch 'rs-update-nprogress-rails' into 'master' Dmitriy Zaporozhets
Bump nprogress-rails to 0.1.6.7 Closes #2866 See merge request !1686
2015-10-26Bump jquery-atwho-rails to ~> 1.3.2Robert Speicher
Closes #2858
2015-10-26Bump nprogress-rails to 0.1.6.7Robert Speicher
Closes #2866
2015-10-15Update redcarpet gem. Fixes gem memory leakDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-15Merge branch 'view-issue-performance'Dmitriy Zaporozhets
2015-10-15Merge branch 'git-archive-golang' into 'master' Douwe Maan
Let gitlab-git-http-server handle archive downloads This change relies on changes in gitlab_git and gitlab-git-http-server. fixes #2429 See merge request !1548
2015-10-15Merge branch 'rs-remove-guard' into 'master' Dmitriy Zaporozhets
Remove guard-rspec and its supporting gems See merge request !1551
2015-10-15Added rack-lineprof for developmentYorick Peterse
This can be used to measure the time (roughly) spent on a per line basis. This can also be used to measure timings for views, for example by adding the following to a URL: ?lineprof=app/views/projects/notes/_note rack-lineprof is only enabled when: 1. The application runs in development mode 2. The used Ruby is MRI 3. The environment variable ENABLE_LINEPROF is set to a non-empty value
2015-10-15Added active_record_query_traceYorick Peterse
This can be used to track down where queries originate from, regardless of whether they're caused by N+1 problems or not. This can be enabled by setting the environment variable ENABLE_QUERY_TRACE to a non-empty value (e.g. "true").
2015-10-15Added Bullet to the GemfileYorick Peterse
This can be used to resolve N+1 query problems. Bullet is disabled by default and can be enabled by starting Rails with the environment variable ENABLE_BULLET set to a non empty value (e.g. "true").
2015-10-15Merge branch 'master' into git-archive-golangDouwe Maan
2015-10-15Update gitlab_git to 7.2.19Jacob Vosmaer
2015-10-15Merge branch 'rs-update-uglifier' into 'master' Dmitriy Zaporozhets
Update uglifier to ~> 2.7.2 Fixes a security vulnerability: - https://github.com/lautis/uglifier/pull/86 - https://github.com/mishoo/UglifyJS2/issues/751 - https://zyan.scripts.mit.edu/blog/backdooring-js/ See merge request !1590