summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Update mail_room.Douwe Maan2015-08-191-1/+1
|
* Changes and stuff.Douwe Maan2015-08-181-0/+2
|
* Update mail_roomDouwe Maan2015-08-181-1/+1
|
* Reply by email POCDouwe Maan2015-08-181-0/+8
|
* Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodulesStan Hu2015-08-171-2/+2
| | | | Closes #2262
* Bump omniauth-saml to 1.4.1rs-gem-securityRobert Speicher2015-08-141-6/+6
| | | | | | | Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247
* Update Flowdock integration to support new Flowdock APIBoyan Tabakov2015-08-141-3/+7
| | | | 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.
* Merge branch 'optimize-haml-textarea-rendering' into 'master'Dmitriy Zaporozhets2015-08-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Bump Haml to 4.0.7 to speed up textarea rendering The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there: https://github.com/haml/haml/pull/850 Closes #1987 See merge request !984
| * Bump Haml to 4.0.7 to speed up textarea renderingStan Hu2015-08-101-1/+1
| | | | | | | | Closes #1987
* | update gitlab_gitgrit_blameValery Sizov2015-08-111-10/+6
| |
* | link to the local gitlab_gitValery Sizov2015-08-111-7/+11
| |
* | Merge branch 'disable-autocrlf-for-binary-files' into 'master'Stan Hu2015-08-101-2/+2
|\ \ | |/ |/| | | | | | | | | | | Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123
| * Fix corrupted binary files when using API files endpointStan Hu2015-08-091-2/+2
| | | | | | | | | | | | Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
* | Add dropzone upload progressNikita Verkhovin2015-08-101-2/+2
|/
* Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-041-8/+6
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Bump redis-store to 1.1.6 and remove redid-store-fix-expiryredis-storeKamil Trzcinski2015-07-311-2/+2
| |
| * Manually update rouge to 1.9.1Stefan Tatschner2015-07-291-2/+2
| | | | | | | | | | | | Since gollum-lib blocks rouge from updating, let's bump the version manually. The fix has already been accepted upstream: https://github.com/gollum/gollum-lib/commit/9c042ea0914a7714abbda9d89e234c8a79fba893
| * Replace Rugments with RougeStefan Tatschner2015-07-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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!
| * Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network ↵Stan Hu2015-07-281-2/+2
| | | | | | | | | | | | graphs Closes #745
* | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-0/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove satellitesDmitriy Zaporozhets2015-07-151-3/+0
|/
* Bump coveralls version, remove explicit rest-client dependencyrs-update-coverallsRobert Speicher2015-07-091-3/+2
|
* Bump capybara to 2.4.0Robert Speicher2015-07-061-3/+3
|
* Bump select2-rails versionRobert Speicher2015-07-061-2/+2
|
* Merge branch 'rs-gem-security' into 'master'Dmitriy Zaporozhets2015-07-021-21/+30
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Gem updates for security issuesRobert Speicher2015-06-301-21/+30
| | | | | | | | | | | | | | | | - 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)
* | Bump Redcarpet to 3.3.2rs-issue-1911Robert Speicher2015-06-301-2/+2
|/ | | | Closes #1911
* Merge branch 'fix-c-prototype-highlighting' into 'master'Stan Hu2015-06-301-2/+2
|\ | | | | | | | | | | | | | | Bump rugments to 1.0.0beta8 to fix C prototype function highlighting Closes #1890 See merge request !902
| * Bump rugments to v1.0.0beta8 to fix C prototype function highlightingStan Hu2015-06-281-2/+2
| | | | | | | | Closes #1890
* | Add Fuubar gemRobert Speicher2015-06-251-1/+9
|/
* Updated the categories of Application Settings FormDarby2015-06-231-0/+3
|
* Bump pg gem to 0.18.2Robert Speicher2015-06-221-1/+1
|
* Bump database_cleaner to ~> 1.4.0Robert Speicher2015-06-221-5/+2
|
* Bump rspec to 3.3.0Robert Speicher2015-06-221-19/+23
|
* Update email_spec gemRobert Speicher2015-06-221-3/+3
| | | | | | This fixes spec/mailers/notify_spec Also only require email_spec in the one place it's used
* Bump poltergeist to 1.6.0Robert Speicher2015-06-221-3/+5
|
* Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-221-2/+2
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-221-13/+14
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Bump gitlab_git to 7.2.5Jacob Vosmaer2015-06-221-2/+2
|
* Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-171-3/+0
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: Gemfile.lock
| * Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-161-0/+3
| |
* | Bump jquery-rails gem versionrs-rails-updateRobert Speicher2015-06-161-2/+2
| |
* | Bump rails to 4.1.11, and make the version requirement exactRobert Speicher2015-06-161-30/+33
|/
* Update Redcarpet to 3.3.0rs-issue-1432Robert Speicher2015-06-131-2/+2
| | | | Fixes #1432
* Merge branch 'rs-pre-rspec-3' into 'master'Dmitriy Zaporozhets2015-06-101-9/+9
|\ | | | | | | | | | | | | | | Changes back-ported from rspec3 branch This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade. See merge request !792
| * Bump shoulda-matchers and webmock gem versionsRobert Speicher2015-06-101-9/+9
| |
* | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-06-101-15/+67
|\ \ | | | | | | | | | | | | | | | | | | | | | update fog to 1.25.0 and add multipart upload support This merge will fix backup uploading problems to s3, closing gitlab-org/gitlab-ce#1059 See merge request !789
| * | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-091-15/+67
| |/
* | Update browser gem to version 0.8.0 for IE11 supportStan Hu2015-06-091-2/+2
|/ | | | Closes #1775
* Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-2/+2
| | | | | | | | | | * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status