summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Bump rack-oauth2 to ~> 1.2.1rs-update-rack-oauth2Robert Speicher2015-11-241-1/+1
|
* 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>
* Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-151-0/+3
|\
| * Added rack-lineprof for developmentYorick Peterse2015-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Added active_record_query_traceYorick Peterse2015-10-151-0/+1
| | | | | | | | | | | | | | 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").
| * Added Bullet to the GemfileYorick Peterse2015-10-151-0/+1
| | | | | | | | | | | | 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").
* | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-151-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-151-24/+20
| |\ \
| * | | Update gitlab_git to 7.2.19Jacob Vosmaer2015-10-151-1/+1
| | | |
* | | | Merge branch 'rs-remove-guard' into 'master' Dmitriy Zaporozhets2015-10-151-16/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Remove guard-rspec and its supporting gems See merge request !1551
| * | | Remove guard-rspec and its supporting gemsrs-remove-guardRobert Speicher2015-10-081-16/+0
| | | |
* | | | Merge branch 'rs-update-uglifier' into 'master' Dmitriy Zaporozhets2015-10-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Update uglifier to ~> 2.7.2rs-update-uglifierRobert Speicher2015-10-141-1/+1
| | |_|/ | |/| |
* | | | Make Reply by email easier to configureDouwe Maan2015-10-131-1/+1
|/ / /
* | | Enable arbitration in MailRoomDouwe Maan2015-10-111-1/+1
| | |
* | | Merge branch 'rs-remove-slim' into 'master' Dmitriy Zaporozhets2015-10-101-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove slim Closes #2897 See merge request !1537
| * | | Remove slimrs-remove-slimRobert Speicher2015-10-081-1/+0
| |/ /
* | | Merge branch 'rs-update-whenever' into 'master' Dmitriy Zaporozhets2015-10-101-3/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Remove whenever gem Closes #2879 See merge request !1538
| * | Just kidding, we're deleting whenever entirelyrs-update-wheneverRobert Speicher2015-10-081-3/+0
| | |
| * | Update whenever to ~> 0.9.4Robert Speicher2015-10-071-1/+1
| | |
* | | Merge branch 'rs-update-slack-notifier' into 'master' Dmitriy Zaporozhets2015-10-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update slack-notifier to ~> 1.2.0 Closes #2826 See merge request !1533
| * | | Update slack-notifier to ~> 1.2.0rs-update-slack-notifierRobert Speicher2015-10-071-1/+1
| |/ /
* | | Merge branch 'rs-update-tinder' into 'master' Dmitriy Zaporozhets2015-10-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update tinder to ~> 1.10.0 Closes #2823 See merge request !1534
| * | | Update tinder to ~> 1.10.0rs-update-tinderRobert Speicher2015-10-071-1/+1
| |/ /
* | | Merge branch 'rs-update-rack-cors' into 'master' Dmitriy Zaporozhets2015-10-081-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update rack-cors to ~> 0.4.0 Closes #2800 See merge request !1536
| * | | Update rack-cors to ~> 0.4.0Robert Speicher2015-10-071-3/+3
| |/ /
* | | Update haml-rails to ~> 0.9.0rs-update-haml-railsRobert Speicher2015-10-071-1/+1
|/ /
* | Merge branch 'rs-update-omniauth-gems' into 'master' Dmitriy Zaporozhets2015-10-071-13/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update omniauth-* gem dependencies - twitter to `~> 1.2.0` - closes #2763 - kerberos to `~> 0.3.0` - closes #2792 - google-oauth2 to `~> 0.2.0` - shibboleth to `~> 1.2.0` - closes #2791 See merge request !1526
| * | Update omniauth-shibboleth to ~> 1.2.0rs-update-omniauth-gemsRobert Speicher2015-10-061-2/+2
| | |
| * | Loosen omniauth-google-oauth2 to ~> 0.2.0Robert Speicher2015-10-061-1/+1
| | |
| * | Update omniauth-kerberos to ~> 0.3.0Robert Speicher2015-10-061-1/+1
| | |
View Lorry Controller Status