home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 04:36:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
873 Commits
Author SHA1 Message Date
Valery Sizov b84ee8d1b3 fix specs 2015-12-03 17:16:53 +02:00
Valery Sizov 7c091d701b Merge branch 'master' into ce_upstream 2015-12-03 14:09:00 +02:00
Valery Sizov 54b74aa998 fix Celluloid warnings 2015-12-03 10:49:02 +02:00
Dmitriy Zaporozhets daaf1d6a39 Fix conflicts in group and project member views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-02 11:54:15 +01:00
Valery Sizov 7b327b68e3 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-12-01 19:54:45 +02:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master' 
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
 2015-11-30 16:49:09 +00:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Robert Speicher 344cb89718 Bump jquery-turbolinks to ~> 2.1.0 
See #2857
 2015-11-27 16:34:59 -05:00
Valery SizovandValery Sizov 7f214cee74 Migrate mailers to ActiveJob 2015-11-26 17:03:43 +02:00
Valery Sizov 3e0fe27627 Merge remote-tracking branch 'origin/master' into rails_update_to_4_2 2015-11-26 12:30:28 +02:00
Valery Sizov 38489d8d7d update test_after_commit gem to 0.4.2 2015-11-26 11:57:04 +02:00
Dmitriy Zaporozhets 1befbbf57d Merge branch 'rs-remove-enumerize' into 'master' 
Remove enumerize gem

Closes #2803 

See merge request !1912
 2015-11-26 09:03:04 +00:00
Dmitriy Zaporozhets 21003c0cb2 Merge branch 'rs-update-asana' into 'master' 
Bump asana to ~> 0.4.0

Closes #2830

See merge request !1911
 2015-11-26 09:01:52 +00:00
Valery Sizov a9b8612818 Merge branch 'ce_upstream' into 'master' 
CE upstream



See merge request !64
 2015-11-26 08:01:23 +00:00
Robert Speicher 5f0d1f30b0 Remove enumerize gem 2015-11-25 17:06:04 -05:00
Robert Speicher 91c0aa5e98 Bump asana to ~> 0.4.0 
Closes #2830
 2015-11-25 17:03:30 -05:00
Robert Speicher 59cc61e246 Bump doorkeeper to ~> 2.2.0 
Closes #2746
 2015-11-25 17:01:02 -05:00
Valery Sizov 40ff1318d2 Rails update to 4.2.4 2015-11-25 18:18:44 +02:00
Dmitriy Zaporozhets 3fd885fd91 Merge branch 'rs-update-colorize' into 'master' 
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-25 09:02:06 +00:00
Dmitriy Zaporozhets 85d537ac73 Merge branch 'rs-update-rack-oauth2' into 'master' 
Bump rack-oauth2 to ~> 1.2.1

Closes #2748

See merge request !1891
 2015-11-25 09:01:12 +00:00
Dmitriy Zaporozhets cbdccf66bf Merge branch 'rs-update-creole' into 'master' 
Bump creole to ~> 0.5.0

Closes #2815

See merge request !1890
 2015-11-25 09:00:38 +00:00
Robert Speicher 28de6770fa Bump colorize to ~> 0.7.0 
Also removes `colored` which came in during the CI merge and is
redundant.

Closes #2822
 2015-11-24 16:29:21 -05:00
Robert Speicher 446a95d307 Bump rack-oauth2 to ~> 1.2.1 2015-11-24 15:48:49 -05:00
Robert Speicher 26f9dbf8a9 Bump creole to ~> 0.5.0 
Closes #2815
 2015-11-24 15:42:42 -05:00
Robert Speicher 776027e4c7 Bump gon to ~> 6.0.1 
Closes #2856
 2015-11-24 15:36:36 -05:00
Valery Sizov 18c7336892 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-11-24 18:06:46 +02:00
Douwe Maan 531f3ac462 Allow license to be uploaded as text rather than file 2015-11-24 15:55:02 +01:00
Dmitriy Zaporozhets 36f7b624be Merge branch 'bundler-audit' into 'master' 
Add bundler-audit to CI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @DouweM @rspeicher @vsizov 

See merge request !1874
 2015-11-23 15:51:39 +00:00
Dmitriy Zaporozhets 93f32b25d2 Add bundler-audit to CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-23 14:57:41 +01:00
Ferdinand Rosario 9b724baa7f Updated rails patch 2015-11-19 15:17:12 +05:30
Valery Sizov f194f56538 fix tests 2015-11-16 16:54:13 +02:00
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05:00
Dmitriy Zaporozhets 12b35c6fe8 Merge branch 'flay' into 'master' 
Add flay: tool to find duplicate code

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1789
 2015-11-11 16:21:35 +00:00
Dmitriy Zaporozhets 7bca4cabc2 Merge branch 'flog' into 'master' 
Add method complexity check to CI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1783
 2015-11-11 15:29:19 +00:00
Dmitriy Zaporozhets 98c954ee81 Add flay: tool to find duplicate code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-11 16:29:00 +01:00
Kamil Trzciński fb5c3c7021 Merge branch 'artifacts' into 'master' 
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-11 12:44:37 +00:00
Dmitriy Zaporozhets 58429d9b26 Add method complexity check to CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-10 18:34:05 +01:00
Stan Hu ffa8d84a6e Bump charlock_holmes version 2015-11-10 07:56:05 -08:00
Stan Hu 78966d4ca6 Bump rugged version to be in line with gitlab_git requirements 2015-11-10 07:36:10 -08:00
Dmitriy Zaporozhets 8972aef558 Merge branch 'state-machine-to-state-machines-activerecord' into 'master' 
Switch to state_machines-activerecord (Fixes: #3374)

state_machine is unmaintained

See merge request !1764
 2015-11-10 12:20:59 +00:00
Kamil Trzcinski d0e3e823a2 Implement Build Artifacts 
- Offloads uploading to GitLab Workhorse
- Use /authorize request for fast uploading
- Added backup recipes for artifacts
- Support download acceleration using X-Sendfile
 2015-11-10 12:51:50 +01:00
Stan Hu 4017a4fcbc Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3. 
Switch back to github-linguist
 2015-11-09 08:17:17 -08:00
Pirate Praveen ddd3dd72fe update Gemfile.lock 2015-11-09 09:11:42 -05:00
Yorick Peterse dec3e4ce64 Added Sherlock, a custom profiling tool for GitLab 
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-09 14:29:10 +01:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
Robert Speicher 5df6b0b758 Merge branch 'facebook-auth' into 'master' 
Add Facebook authentication

See merge request !1740
 2015-11-04 15:23:38 +00:00
Douwe Maan 4773d98e83 Add Facebook authentication 2015-11-03 17:59:07 +01:00
Robert Speicher 700909d567 Bump stamp to ~> 0.6.0 
Closes #2801
 2015-11-03 11:48:05 -05:00
Dmitriy Zaporozhets deb700419d Merge branch 'rs-update-nprogress-rails' into 'master' 
Bump nprogress-rails to 0.1.6.7

Closes #2866

See merge request !1686
 2015-10-28 13:58:15 +00:00
Robert Speicher 63c74bb0ee Bump jquery-atwho-rails to ~> 1.3.2 
Closes #2858
 2015-10-26 10:39:33 +01:00