home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,868 Commits 48 Branches 340 Tags
a87f03768f87c3ebe62b7aaf94380eb56239bd4e
Commit Graph
8868 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert SpeicherandDmitriy Zaporozhets a87f03768f Fix deprecation warning output 
Removes the following from test output:

  DEPRECATION WARNING: It looks like you are eager loading table(s) (one
  of: merge_requests, projects) that are referenced in a string SQL
  snippet. For example:

      Post.includes(:comments).where("comments.title = 'foo'")

  Currently, Active Record recognizes the table in the string, and knows
  to JOIN the comments table to the query, rather than loading comments in
  a separate query. However, doing this without writing a full-blown SQL
  parser is inherently flawed. Since we don't want to write an SQL parser,
  we are removing this functionality. From now on, you must explicitly
  tell Active Record when you are referencing a table from a string:

      Post.includes(:comments).where("comments.title =
  'foo'").references(:comments)

  If you don't rely on implicit join references you can disable the
  feature entirely by setting
  `config.active_record.disable_implicit_join_references = true`.
 2014-03-24 15:00:01 +02:00
Dmitriy Zaporozhets d66d10970d Merge pull request #6594 from tsigo/rs-small-changes 
Small changes
 2014-03-24 14:58:35 +02:00
Dmitriy Zaporozhets 92c811e8d2 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-03-24 14:56:12 +02:00
Dmitriy Zaporozhets 79f143c3f1 Merge branch 'monthly-process' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/release/monthly.md
 2014-03-24 14:55:39 +02:00
Dmitriy Zaporozhets 2b088b9f83 Merge branch 'no_render_log' into 'master' 
Suppress 'Rendered...' log messages
 2014-03-24 12:40:08 +00:00
dosire de5e41c67d Move up in the month. 2014-03-24 13:35:24 +01:00
Jacob Vosmaer 7862201de9 Add source for 'Rendered' message suppression 2014-03-24 09:57:28 +01:00
Jacob Vosmaer b816389182 Suppress 'Rendered' messages in production.log 2014-03-24 09:56:26 +01:00
Dmitriy Zaporozhets 12d162993e Merge pull request #6602 from dblessing/mobile_ui 
Mobile UI improvements
 2014-03-24 09:49:25 +02:00
Dmitriy Zaporozhets 2db4d8f844 Merge pull request #6593 from jvanbaarsen/mr-template 
Added some extra information how a good MR looks like
 2014-03-24 09:48:17 +02:00
Dmitriy Zaporozhets 28eb6c6976 Merge pull request #6597 from awiddersheim/patch-1 
Remove periods from merge request
 2014-03-24 09:46:59 +02:00
Dmitriy Zaporozhets 9d5aca31d1 Merge pull request #6601 from cirosantilli/dev-key-id-from-1 
Start development Key seed id from 1 to prevent `Couldn't find Key with id=0` crash on MySQL.
 2014-03-24 09:46:37 +02:00
Dmitriy Zaporozhets 6d4b934059 Merge pull request #6596 from tsigo/rs-project-service-specs 
Move Project's service specs to the correct location
 2014-03-24 09:46:19 +02:00
Dmitriy Zaporozhets 2a732a6b6a Merge branch 'update/6-0-to-6-7' into 'master' 
Update guide from 6.0 to 6.7
 2014-03-24 07:24:04 +00:00
Drew Blessing dab09af518 Mobile UI Improvements 
Move spinner for mobile
 2014-03-23 21:30:37 -05:00
Ciro Santillli 6672d6492f Start development Key seed id from 1. 2014-03-23 23:49:22 +01:00
Jeroen van Baarsen 6adbfda2f8 Better naming things 2014-03-23 19:13:30 +01:00
awiddersheim 3704d85bc4 Remove periods from merge request 
The "Merged by" and "Closed by" statements end with an extra space followed by a period. This doesn't seem necessary to me and not having the extra space followed by a period looks better to me. Also, the top of the merge request doesn't have the sentence ending with a period.
 2014-03-22 16:44:13 -04:00
Robert Speicher 07833d1676 Move Project's service specs to the correct location 
[ci skip]
 2014-03-22 16:38:22 -04:00
Robert Speicher 760f827ba0 Remove code that does nothing 
ping @karlhungus
 2014-03-22 15:40:42 -04:00
Robert Speicher fa34059574 Default message for SatelliteNotExistError 2014-03-22 15:36:54 -04:00
Jeroen van Baarsen 4b2c50d53f Added some extra information how a good MR looks like 2014-03-22 20:34:05 +01:00
Dmitriy Zaporozhets ae1a314824 Fix upgrader 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:08:36 +02:00
Dmitriy Zaporozhets 5c038d949f Fix gitlab-ci integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:04:57 +02:00
dosireandDmitriy Zaporozhets d8a015cc97 Should be 6-7. 2014-03-21 22:52:08 +02:00
Marin Jankovski 6bb474a0dc Version 6.7.0 2014-03-21 17:27:13 +01:00
Sytse Sijbrandij a13190bca5 Merge branch 'what-is-a-bug' into 'master' 
What Is A Bug
 2014-03-21 14:57:51 +00:00
dosire d03612412a Ensure I can link to this line. 2014-03-21 15:51:30 +01:00
dosire af3aaaddbd Features people are missing are not bugs. 2014-03-21 15:50:33 +01:00
Jacob Vosmaer 20c3cbb18c Update monster update guide to 6.0-to-6.7 2014-03-21 15:04:45 +01:00
Dmitriy Zaporozhets 1c42cc35a1 Merge branch 'fix-grack-auth' into 'master' 
Fix http clone for public project
 2014-03-21 12:55:27 +00:00
Dmitriy Zaporozhets 7dd18a3ec8 Fix http clone for public project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 14:52:30 +02:00
Dmitriy Zaporozhets 8ae593304b Merge branch 'update_upgrade_document' into 'master' 
Update Upgrade Document for 6.7

Use the latest version of gitlab-shell which is 1.9.0
 2014-03-21 11:44:24 +00:00
Marin Jankovski 895c913247 Use the latest tag, 1.9.1 for gitlab-shell. 2014-03-21 12:42:59 +01:00
Marin Jankovski 6d9dccbec8 Checkout gitlab-shell v 1.9.0 2014-03-21 12:26:34 +01:00
Dmitriy Zaporozhets fb919a631c Merge branch 'dmedvinsky-username-keys-content-type' 2014-03-21 09:37:18 +02:00
Dmitriy Zaporozhets ac35ee3707 Merge branch 'username-keys-content-type' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-21 09:37:03 +02:00
Dmitriy Zaporozhets 60c3e841ce Merge branch 'gitlab_emoji_gem' into 'master' 
Replace gemoji with open source PhantomOpenEmoji
 2014-03-20 18:30:01 +00:00
Dmitry Medvinsky fefab47456 Fix /:username.keys response content type 
Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.
 2014-03-20 19:09:14 +04:00
Marin Jankovski 9afd04842f Update Changelog 2014-03-20 13:46:31 +01:00
Marin Jankovski 4dc09e5c1d New bindings to vote on notes. 2014-03-20 13:33:16 +01:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Marin Jankovski 817f5ff6a3 Use gitlab_emoji gem instead of gemoji. 2014-03-20 13:33:16 +01:00
Dmitriy Zaporozhets c0090a3ff5 Merge branch 'cloud-update' into 'master' 
Cloud Update

/cc @jacobvosmaer @marin @job
 2014-03-20 11:56:18 +00:00
Dmitriy Zaporozhets 4f167ea00e Merge branch 'oauth-require-public-email' into 'master' 
Oauth Require Public Email

Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.
 2014-03-20 11:55:55 +00:00
Dmitriy Zaporozhets 303d131102 Merge branch 'deploy-key-doc' into 'master' 
Deploy Key Doc

/cc @marin @job @jacobvosmaer
 2014-03-20 11:54:34 +00:00
Dmitriy Zaporozhets e013be10d7 GitLab requires gitlab-shell v1.9.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 13:37:35 +02:00
Sytse Sijbrandij a74194a550 Merge branch 'changelog_oreilly' into 'master' 
Changelog O'Reilly

added "Better API for access_levels" sponsorship from O'Reilly to CHANGELOG
 2014-03-20 09:41:45 +00:00
Marc Radulescu 3a294daf53 added OReilly sponsorship to CHANGELOG 2014-03-20 10:04:41 +01:00
Dmitriy Zaporozhets 83e83b6617 Improve grack auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:53:03 +02:00