summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-111-0/+1
| | | | | This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
* Merge branch 'rs-update-gitlab_emoji' into 'master' Valery Sizov2015-12-111-1/+1
|\ | | | | | | | | | | | | | | Bump gitlab_emoji to ~> 0.2.0 A new version of this gem was released October 29th but was never bumped in GitLab. See merge request !1994
| * Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emojiRobert Speicher2015-12-051-1/+1
| |
* | Merge branch 'bump-devise-3.5.3' into 'master' Dmitriy Zaporozhets2015-12-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump devise to 3.5.3 to fix reset token expiring after account creation Also fixes an incorrect redirect after login with relative URL root: Closes https://github.com/gitlabhq/gitlabhq/issues/8228 Closes #2750 See merge request !2056
| * | Bump devise to 3.5.3 to fix reset token expiring after account creationStan Hu2015-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes an incorrect redirect after login with relative URL root: Closes https://github.com/gitlabhq/gitlabhq/issues/8228 Closes #2750
* | | Upgraded Sidekiq to 4.xfeature/sidekiq-4Gabriel Mazetto2015-12-101-2/+3
|/ /
* | Remove RedCloth and no longer allow bundle-audit to failDouwe Maan2015-12-091-1/+0
| |
* | Bump gollum-lib to 4.1.0 and fix dependency mismatch with rougeStan Hu2015-12-081-1/+1
| | | | | | | | Closes #3767
* | add explicit reference to rouge 1.10.1gemfile_fixValery Sizov2015-12-081-1/+2
| |
* | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-071-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-041-2/+2
| |/ | | | | | | Updated Sidekiq to 3.5.x
* | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-0/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-301-2/+8
|\ | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| * Migrate mailers to ActiveJobValery Sizov2015-11-261-0/+1
| |
| * Merge remote-tracking branch 'origin/master' into rails_update_to_4_2Valery Sizov2015-11-261-5/+2
| |\
| * | update test_after_commit gem to 0.4.2Valery Sizov2015-11-261-1/+1
| | |
| * | Rails update to 4.2.4Valery Sizov2015-11-251-1/+6
| | |
* | | Bump jquery-turbolinks to ~> 2.1.0rs-update-jquery-turbolinksRobert Speicher2015-11-271-1/+1
| |/ |/| | | | | See #2857
* | Merge branch 'rs-remove-enumerize' into 'master' Dmitriy Zaporozhets2015-11-261-3/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove enumerize gem Closes #2803 See merge request !1912
| * | Remove enumerize gemrs-remove-enumerizeRobert Speicher2015-11-251-3/+0
| |/
* | Merge branch 'rs-update-asana' into 'master' Dmitriy Zaporozhets2015-11-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Bump asana to ~> 0.4.0 Closes #2830 See merge request !1911
| * | Bump asana to ~> 0.4.0rs-update-asanaRobert Speicher2015-11-251-1/+1
| |/ | | | | | | Closes #2830
* | Bump doorkeeper to ~> 2.2.0rs-update-doorkeeperRobert Speicher2015-11-251-1/+1
|/ | | | Closes #2746
* Merge branch 'rs-update-colorize' into 'master' Dmitriy Zaporozhets2015-11-251-2/+1
|\ | | | | | | | | | | | | | | | | | | 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
| * Bump colorize to ~> 0.7.0Robert Speicher2015-11-241-2/+1
| | | | | | | | | | | | | | Also removes `colored` which came in during the CI merge and is redundant. Closes #2822
* | Merge branch 'rs-update-rack-oauth2' into 'master' Dmitriy Zaporozhets2015-11-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Bump rack-oauth2 to ~> 1.2.1 Closes #2748 See merge request !1891
| * | Bump rack-oauth2 to ~> 1.2.1rs-update-rack-oauth2Robert Speicher2015-11-241-1/+1
| |/
* | Merge branch 'rs-update-creole' into 'master' Dmitriy Zaporozhets2015-11-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Bump creole to ~> 0.5.0 Closes #2815 See merge request !1890
| * | Bump creole to ~> 0.5.0rs-update-creoleRobert Speicher2015-11-241-1/+1
| |/ | | | | | | Closes #2815
* | Bump gon to ~> 6.0.1rs-update-gonRobert Speicher2015-11-241-1/+1
|/ | | | Closes #2856
* Merge branch 'bundler-audit' into 'master' Dmitriy Zaporozhets2015-11-231-0/+1
|\ | | | | | | | | | | | | | | | | Add bundler-audit to CI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM @rspeicher @vsizov See merge request !1874
| * Add bundler-audit to CIDmitriy Zaporozhets2015-11-231-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Updated rails patchFerdinand Rosario2015-11-191-1/+1
|/
* Merge branch 'flay' into 'master' Dmitriy Zaporozhets2015-11-111-0/+1
|\ | | | | | | | | | | | | Add flay: tool to find duplicate code Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1789
| * Add flay: tool to find duplicate codeflayDmitriy Zaporozhets2015-11-111-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'flog' into 'master' Dmitriy Zaporozhets2015-11-111-0/+1
|\ \ | |/ | | | | | | | | | | Add method complexity check to CI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1783
| * Add method complexity check to CIflogDmitriy Zaporozhets2015-11-101-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-111-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Implement Build ArtifactsKamil Trzcinski2015-11-101-1/+1
| | | | | | | | | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
* | Merge branch 'state-machine-to-state-machines-activerecord' into 'master' Dmitriy Zaporozhets2015-11-101-1/+1
|\ \ | |/ |/| | | | | | | | | Switch to state_machines-activerecord (Fixes: #3374) state_machine is unmaintained See merge request !1764
| * Switch to state_machines-activerecord (Fixes: #3374)Pirate Praveen2015-11-081-1/+1
| |
* | Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3.Stan Hu2015-11-091-7/+3
| | | | | | | | Switch back to github-linguist
* | Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-091-3/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | 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`.
* Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-041-0/+1
|\ | | | | | | | | Add Facebook authentication See merge request !1740
| * Add Facebook authenticationDouwe Maan2015-11-031-0/+1
| |
* | Bump stamp to ~> 0.6.0rs-update-stampRobert Speicher2015-11-031-1/+1
|/ | | | Closes #2801
* Merge branch 'rs-update-nprogress-rails' into 'master' Dmitriy Zaporozhets2015-10-281-1/+1
|\ | | | | | | | | | | | | Bump nprogress-rails to 0.1.6.7 Closes #2866 See merge request !1686
| * Bump nprogress-rails to 0.1.6.7rs-update-nprogress-railsRobert Speicher2015-10-261-1/+1
| | | | | | | | Closes #2866
* | Bump jquery-atwho-rails to ~> 1.3.2rs-update-jquery-atwho-railsRobert Speicher2015-10-261-1/+1
|/ | | | Closes #2858
* Update redcarpet gem. Fixes gem memory leakupdate-redcarpetDmitriy Zaporozhets2015-10-151-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>