deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3211 commits 6 branches 43 tags 25 MiB
Commit graph

3211 commits

This branch
This branch
All branches
Author SHA1 Message Date
Riyad Preukschas
d4e3664067 Fix bug in MergeRequest#mark_as_unmergable 2012-10-20 15:27:34 +02:00
Riyad Preukschas
122769e358 Refactor Gitlab::Merge 
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
 2012-10-20 15:25:48 +02:00
Godric
054c15e7b5 enable Oauth login for existing regular users 
fix: https://github.com/gitlabhq/gitlabhq/issues/1620
 2012-10-20 00:38:07 +03:00
Nihad Abbasov
414080cb03 remove unnecessary snippets.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
c28722689d merge graph.js into projects.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
41ec540033 remove unnecessary loader.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
57c134c39a cleanup coffeescript code for mentions auto-complete 2012-10-19 03:41:10 -07:00
Nihad Abbasov
ec1bccb261 use 'js-' prefix for behavioral 'gfm-input' class 2012-10-19 03:41:10 -07:00
Nihad Abbasov
46921e690e cleanup main.coffee 2012-10-19 03:41:10 -07:00
Nihad Abbasov
b1ef7d7a44 fix typo in spec 2012-10-19 03:41:09 -07:00
Nihad Abbasov
cf70439e0a update API docs 2012-10-19 03:39:02 -07:00
Nihad Abbasov
00325a733a name and password_confirmation not required to create a user via API 2012-10-19 03:34:18 -07:00
Nihad Abbasov
0369c74e58 fix wrong test case 2012-10-19 03:28:26 -07:00
Nihad Abbasov
2dc0f098fd fix typos in specs 2012-10-19 03:25:39 -07:00
Nihad Abbasov
c610206321 fix mass-assignment error in user create API 2012-10-19 03:23:10 -07:00
Nihad Abbasov
770ec3359d fix ambiguous entry in changelog 2012-10-19 03:09:34 -07:00
Riyad Preukschas
4fd73683d9 Update author info in tree view 2012-10-18 20:53:35 +02:00
Riyad Preukschas
aef2031ad6 Add CommitDecorator#author_link 2012-10-18 20:16:52 +02:00
Riyad Preukschas
b3a5f0a78d Fix wrong parameter order in Team#team_member_by_name_or_email 2012-10-18 20:16:52 +02:00
Saito
51ef5b9297 add shared repository doc. 2012-10-18 18:00:43 +08:00
Dmitriy Zaporozhets
c007325451 Merge pull request #1712 from riyad/use-gem-for-emoji 
Use gem for Emoji
 2012-10-18 00:28:47 -07:00
Dmitriy Zaporozhets
61e5fb6f37 Merge pull request #1695 from riyad/cleanup-note-observer-and-notifications 
Code cleanup on NoteObserver and Notify
 2012-10-18 00:26:30 -07:00
Dmitriy Zaporozhets
ca42e91e61 Merge pull request #1727 from gitlabhq/fix_bug_wiki 
Fix 500 error when project is empty
 2012-10-18 00:23:20 -07:00
Riyad Preukschas
413778b645 Rename NoteObserver methods and clarify things 2012-10-18 01:14:10 +02:00
Riyad Preukschas
853c69c48a Reorder and group methods in Notify mailer 2012-10-18 01:14:09 +02:00
Riyad Preukschas
ce91014730 Fix use of Emoji 2012-10-18 01:10:35 +02:00
Riyad Preukschas
5d42d92c87 Remove old Emoji code and images 2012-10-18 01:10:35 +02:00
Riyad Preukschas
b42c53c2e5 Add gemoji gem 2012-10-18 01:10:35 +02:00
Valeriy Sizov
883d138f15 Fix 500 error when project is empty 2012-10-17 23:59:42 +03:00
randx
db469ea3e6 Fixing broken test of project last_activity 2012-10-17 22:35:08 +03:00
randx
e0c43c46dd Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard 2012-10-17 22:02:52 +03:00
randx
a9a3480de9 v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog 2012-10-17 22:01:27 +03:00
Valeriy Sizov
8e989d4863 revert all wiki changes 2012-10-17 16:14:20 +03:00
Valeriy Sizov
7a0a552b43 revert 2012-10-17 15:21:16 +03:00
Valeriy Sizov
31f1cebe4b Wiki style: move styles to right place 2012-10-17 15:17:27 +03:00
Valeriy Sizov
607d8b7970 Wiki Style Fixing 2012-10-17 15:09:16 +03:00
Valeriy Sizov
7166739086 Merge pull request #1715 from riyad/use-font-awesome 
Use Font Awsome for icons
 2012-10-17 03:08:12 -07:00
Valeriy Sizov
d8262573b8 Merge pull request #1719 from SaitoWu/features/sharedRepository 
add shared repository support
 2012-10-17 02:27:40 -07:00
Saito
83626d05cd add shared repository support 2012-10-17 15:43:44 +08:00
Valeriy Sizov
372220d35b WebEditor: Cancel button. Confirm #1705 2012-10-17 00:27:47 +03:00
Valeriy Sizov
234eb7a8e4 WebEditor: rename button save -> commit #1705 2012-10-17 00:15:56 +03:00
Valeriy Sizov
ec05d9daf9 WebEditor: show branch #1705 2012-10-17 00:13:45 +03:00
Valeriy Sizov
d21443d1c6 Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons 
Fix issue close and reopen button text and styles
 2012-10-16 14:05:53 -07:00
Valeriy Sizov
8ee8f36f6e WebEditor: fix unknown theme in production mode 2012-10-16 23:52:44 +03:00
Ilya Baryshev
e6524a919e Wiki search 
Very basic, using LIKE, and no search snippets.
 2012-10-16 23:05:11 +04:00
Riyad Preukschas
789e4b848c Import Font Awesome styles 2012-10-16 20:48:32 +02:00
Riyad Preukschas
30a31d63da Add font-awesome-sass-rails gem 2012-10-16 20:27:44 +02:00
Riyad Preukschas
fa4c38f32b Fix issues close and reopen button text and styles 2012-10-16 19:17:48 +02:00
Valeriy Sizov
2a750bf2ca Merge pull request #1704 from riyad/small-file-edit-fixes 
Small fixes for editing files
 2012-10-16 04:03:38 -07:00
Riyad Preukschas
8e8d82d49a Only allow editing text files 2012-10-16 12:45:48 +02:00