home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ábner Silva de Oliveira 85b5812bc2 moving labels specs to projects_spec file 2014-03-22 17:29:13 -03:00
Ábner Silva de Oliveira cc575875b6 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-03-22 16:43:09 -03: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
Ali Tavakoli 78261b4aad Set monospace font-family for textarea.js-gfm-input 2014-03-21 14:14:11 -04: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
Ábner Silva de Oliveira 44aa6b90dd added api method to return labels of a given project 2014-03-21 06:25:25 -03: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
dosire 0bc8879468 Tell how to do it, solves https://twitter.com/unwiredbrain/status/446588631424462848 2014-03-20 15:32:30 +01:00
Jacob Vosmaer cc83c696c0 Add load_ok to background_jobs usage message 2014-03-20 14:47:06 +01:00
Jacob Vosmaer dd7efd1768 Add load_ok check to script/background_jobs 2014-03-20 14:44:55 +01: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
Tom de Bruijn 2767abd90d Clearfix on well-lists. Pages affected: 
Pages affected:
- admin/groups#show
- admin/projets#index
- admin/users#index
- dashboard/issues#index (on small screens)
 2014-03-20 13:31:55 +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
Dmitriy Zaporozhets 19c28822ef Add Gitlab::GitAccess class to resolve auth issues during pull/push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 189f88de5b rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.7.0.rc1 		2014-03-20 10:03:02 +02:00
Dmitriy Zaporozhets fbc8b2c2d6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-20 10:01:09 +02:00
Sytse Sijbrandij ef0876a8f7 Merge pull request #6568 from skv-headless/patch-1 
typo fix
 2014-03-19 20:46:31 +01:00
Dmitriy Zaporozhets 5f76a7499f Merge branch 'someone-asked-us-to-update-the-changelog' into 'master' 
Someone Asked Us To Update The Changelog
 2014-03-19 19:10:41 +00:00