root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
18,891 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

588 Commits

Author SHA1 Message Date
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Kamil Trzcinski 2d8c4273ef Fix models/ci/mail_service_spec.rb 
- Change Notify to Ci::Notify
- Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
 2015-09-15 23:18:52 +02:00
Kamil Trzcinski ddde3e3ae8 Remove gitlab_ci_meta from gems 2015-09-15 22:42:30 +02:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
# Conflicts:
#	Gemfile.lock
 2015-09-15 22:40:35 +02:00
Jared Szechy c95b8476c7 bump fogbugz gem 2015-09-15 16:09:32 -04:00
Jared Szechy 93bb8f14ef Use fixed version of fogbugz gem 
This allows us to properly handle authentication errors.
 2015-09-15 15:23:30 -04:00
Dmitriy Zaporozhets d516b02eb4 Fix brakeman 2015-09-09 15:41:21 +02:00
Dmitriy Zaporozhets 870f553bf3 Fix spinach exception 2015-09-09 15:32:20 +02:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Valery Sizov 3d6fed54f0 fix Gemfile 2015-09-09 11:06:35 +03:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Valery Sizov 954dd7ce87 Merge branch 'crowd' into 'master' 
Crowd integration

https://dev.gitlab.org/gitlab/gitlabhq/issues/2217

See merge request !1228
 2015-09-07 11:20:03 +00:00
Valery Sizov 3700e5a960 Crowd integration 2015-09-02 12:42:01 +03:00
Douwe Maan d72b8f87ac Update mail_room to 0.4.2 for better error handling 2015-09-02 08:12:01 +01:00
Jacob Vosmaer 90b1ecfa01 Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server 2015-08-31 15:51:41 +02:00
Jacob Vosmaer 4027a26e7b Replace grack with gitlab-git-http-server 2015-08-31 15:30:15 +02:00
Stan Hu ef6c06c0f3 Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files 
Closes https://github.com/gitlabhq/gitlabhq/issues/9577
 2015-08-27 13:08:15 -07:00
Douwe Maan 843694f902 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-08-26 17:53:31 -07:00
Douwe Maan bc683a5904 Update mail_room 2015-08-26 08:58:46 -07:00
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Stan Hu 6318a76311 Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode 
Closes #2271
 2015-08-23 16:52:29 -07:00
Douwe Maan 3ff9d5c64c Use canonical version of mail_room. 2015-08-20 10:58:04 -07:00
Douwe Maan 8906cabae7 Changes and stuff. 2015-08-18 17:02:26 -07:00
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -07:00
Stan Hu 47d55306d9 Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules 
Closes #2262
 2015-08-17 23:56:02 +00:00
Robert Speicher adfcd57296 Bump omniauth-saml to 1.4.1 
Updates a vulnerable `ruby-saml` dependency.

- 9853651b96
- https://github.com/onelogin/ruby-saml/pull/247
 2015-08-14 22:24:21 -04:00
Boyan Tabakov 88ab815b38 Update Flowdock integration to support new Flowdock API 
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
 2015-08-14 16:45:23 +02:00
Valery Sizov cf6e58b589 update gitlab_git 2015-08-11 15:11:58 +03:00
Valery Sizov d9402504ad link to the local gitlab_git 2015-08-11 09:16:11 +03:00
Stan Hu c5648de230 Fix corrupted binary files when using API files endpoint 
Add CHANGELOG for gitlab_git 7.2.9 updates

Closes #2219
 2015-08-09 15:23:22 -07:00
Stefan Tatschner f736721c5b Replace Rugments with Rouge 
I have mainly created the rugments fork for the purpose of improving
gitlab's highlighting. Nowadays IMO it works way better than the old
highlight.js solution. But the development is stuck on my side because
of a couple of personal reasons:

  * I have finished my studies; last months I was writing my master
    thesis. So there was a huge time problem. I am sorry for that.

  * I had to move to Munich due to getting a (paid) job. Searching a
    flat here is horrible... :)

  * Last but not least, maintaining the same code base in two seperate
    projects is a mess.

I have decided to switch back to rouge due to several reasons:

  * In the beginning I was quite motivated, but since I start
    working on my new job next week, the best solution IMO is
    switching back to upstream rouge.

  * Rouge is continously improving:
    https://github.com/jneen/rouge/blob/master/CHANGELOG.md
    http://rouge.jneen.net/

  * There should be absolutely no regressions with this change. Most
    likely this pull request will almost fix some minor bugs.

  * One less gem in gitlab is a good thing. since Gitlab is quite a
    huge bundle of gems. Reducing complexity should be a major
    milestone.

Thanks a lot to @stanhu and @jneen for the review!
 2015-07-29 07:40:58 +02:00
Stan Hu c22b4061c2 Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network graphs 
Closes #745
 2015-07-28 16:47:30 +00:00
Yorick Peterse 58b94be9a7 Only load byebug on MRI 
This Gem relies on MRI specific debugging APIs. This at least allows
installation on Rubinius/JRuby.
 2015-07-18 14:08:59 +02:00
Robert Speicher b50bfcc619 Bump coveralls version, remove explicit rest-client dependency 2015-07-09 18:35:40 -04:00
Robert Speicher ea565653a0 Bump capybara to 2.4.0 2015-07-06 22:39:55 -04:00
Robert Speicher 9e53ad5e20 Bump select2-rails version 2015-07-06 22:39:55 -04:00
Dmitriy Zaporozhets 2cbf452821 Merge branch 'rs-gem-security' into 'master' 
Gem updates for security issues

- sprockets (rails dependency, but we need to specify a version to pull
  in fixes)
- sass-rails (no security issues, but required an update to meet new
  sprockets version requirement)
- rest-client (coveralls dependency)

See merge request !915
 2015-07-02 08:25:18 +00:00
Job van der Voort d18f1ce75d Merge branch 'k-devise' into 'master' 
added note about Devise

Added note about the authentication gem used in GitLab

Because of question in https://groups.google.com/forum/#!topic/gitlabhq/G2rToah19-Q

See merge request !912
 2015-07-01 08:46:26 +00:00
Robert Speicher 3078b13e72 Gem updates for security issues 
- sprockets (rails dependency, but we need to specify a version to pull
  in fixes)
- sass-rails (no security issues, but required an update to meet new
  sprockets version requirement)
- rest-client (coveralls dependency)
 2015-06-30 21:38:26 -04:00
Robert Speicher c5b9d4720e Bump Redcarpet to 3.3.2 
Closes #1911
 2015-06-30 18:18:51 -04:00
karen Carias 9e4a4667d9 fixed note 2015-06-30 12:25:36 -07:00
karen Carias bea0b6df38 added note about Devise 2015-06-30 11:42:33 -07:00
Stan Hu e489b07d2b Merge branch 'fix-c-prototype-highlighting' into 'master' 
Bump rugments to 1.0.0beta8 to fix C prototype function highlighting

Closes #1890

See merge request !902
 2015-06-30 05:32:56 +00:00
Stan Hu e5661001d6 Bump rugments to v1.0.0beta8 to fix C prototype function highlighting 
Closes #1890
 2015-06-28 16:21:20 -07:00
Robert Speicher 07ac873037 Add Fuubar gem 2015-06-25 21:43:24 -04:00
Robert Speicher 018fcc596f Bump database_cleaner to ~> 1.4.0 2015-06-22 12:13:47 +02:00
Robert Speicher 15133d99de Bump rspec to 3.3.0 2015-06-22 12:13:46 +02:00
Robert Speicher 20a871cc21 Update email_spec gem 
This fixes spec/mailers/notify_spec

Also only require email_spec in the one place it's used
 2015-06-22 12:13:46 +02:00
Robert Speicher 990ddeba85 Bump poltergeist to 1.6.0 2015-06-22 12:13:46 +02:00
Jeroen van Baarsen d6cd2e6a53 Upgrade to newer version of Capybara 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-06-22 12:12:49 +02:00