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
8,864 Commits 48 Branches 340 Tags
6-7-stable
Commit Graph
8864 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 00aa5c16ee Version 6.7.5. v6.7.5 2014-04-14 09:21:42 +02:00
Jonathan A. SternbergandMarin Jankovski c67e3067d2 Fix emails on push service when a single commit is pushed 
Conflicts:
	CHANGELOG
 2014-04-14 09:19:57 +02:00
Marin Jankovski 2f5b6e137e Version to 6.7.4. v6.7.4 2014-04-10 10:10:23 +02:00
Pierre de La MorinerieandMarin Jankovski 2729bdf3a0 Don't send an email for "mentioned in" notes 
Currently, an email is sent every time a mentionable is referenced
by an issue, a commit or a merge request: if I comment "This MR is
related to #5", watchers get one email for the comment, and another
one stating "Issue #5 was mentioned by issue #13".

This is annoying — but the biggest issue is when pushing an existing
branch. Every issue referenced by commit messages in this branch will
get a new mention (which is fine), and dozens of emails will be sent
for all these new mentions (which is not).

This commit fixes the spam by avoiding to send an email when a new
mention is created. In most cases the email notification for the
mentioner is enough.
 2014-04-10 10:08:59 +02:00
Marin Jankovski c6ed523096 Revert "Merge pull request #6720 from thmo/6-7-stable" 
This reverts commit e6707f6f27, reversing
changes made to f88d30fac8.
 2014-04-10 10:02:41 +02:00
Dmitriy Zaporozhets e6707f6f27 Merge pull request #6720 from thmo/6-7-stable 
Fix avatars in the network graph for relative-url setups.
 2014-04-08 15:17:51 +03:00
Thomas Moschny 5bae15bea0 Fix avatars in the network graph for relative-url setups. 2014-04-07 19:10:28 +02:00
Marin Jankovski f88d30fac8 Bump version to 6.7.3, update changelog. v6.7.3 2014-04-03 09:56:44 +02:00
Marin Jankovski b2de30c51e Merge branch 'patch/6-7-2' into '6-7-stable' 
6.7.3 patch release
 2014-04-03 07:54:57 +00:00
Marin Jankovski fcbebcb6aa Do not require modernizr. 
Conflicts:
	app/assets/javascripts/main.js.coffee
 2014-04-03 09:51:03 +02:00
Marin Jankovski 51bc2c0d7f Remove modernizr gem. 2014-04-03 09:47:29 +02:00
Dmitriy ZaporozhetsandJacob Vosmaer 60fc9348e7 Use current_user for Notification#merge_mr 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 16:20:32 +02:00
Jacob Vosmaer 05047b5ec1 Update CHANGELOG for 6.7.2 2014-04-01 17:51:20 +02:00
Jacob Vosmaer 9652be8d07 Drop all tables before restoring a PostgreSQL DB 
Invoking 'db:schema:load' turned out to be a bad idea: when downgrading
an existing GitLab installation, the schema of the newer version would
be preserved when trying to import the old version.

Conflicts:
	CHANGELOG
 2014-04-01 17:50:37 +02:00
Jacob Vosmaer 0fa16b6886 Add a rake task that drops all tables 2014-04-01 17:49:20 +02:00
Pierre de La MorinerieandJacob Vosmaer 582540889a Fix the merge notification email not being sent 
The 'author_id_of_changes' attribute is not persisted in the database.
As we retrieve the merge request from the DB just before sending the
email, this attribute was always nil.

Also there was no tests for the merge notification code - tests have
been added.

Fix #6605
 2014-04-01 17:48:49 +02:00
Dmitriy Zaporozhets dbbf4ea24c Version 6.7.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.7.2 		2014-03-21 23:11:01 +02:00
Dmitriy Zaporozhets a261c5fc94 Fix upgrader 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:09:33 +02:00
Dmitriy Zaporozhets ba0d8842f5 Version 6.7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.7.1 		2014-03-21 23:06:30 +02:00
Dmitriy Zaporozhets b8d83d2538 Fix gitlab-ci integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:05:28 +02:00
Dmitriy Zaporozhets 919bc9792a Merge branch 'update-install-doc-branch' into '6-7-stable' 
Update Install Doc Branch

/cc @marin
 2014-03-21 18:00:49 +00:00
dosire a9863ed0ee Should be 6-7. 2014-03-21 18:34:59 +01:00
Marin Jankovski 80236d6c6c Version 6.7.0 v6.7.0 2014-03-21 17:22:12 +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
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
Dmitriy Zaporozhets 612a909eac Merge branch 'git-refactoring' into 'master' 
Git Refactoring
 2014-03-20 08:28:58 +00:00
Dmitriy Zaporozhets 41e981740f Use 2 workers in development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 729b358ff2 push via http now served via /allowed API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets f18a714f35 Use GitAccess in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00