Commits · 5ec1ad8b2375bdce7a820df1be3dc67b18ad2bd0 · Boxiang Sun / gitlab-ce

21 Oct, 2012 1 commit
- Merge pull request #1743 from riyad/fix-merging-bugs · 5ec1ad8b
  Dmitriy Zaporozhets authored Oct 21, 2012
```
Fix merging bugs
```
  5ec1ad8b
20 Oct, 2012 2 commits
- Fix bug in MergeRequest#mark_as_unmergable · d4e36640
  Riyad Preukschas authored Oct 20, 2012
  
  d4e36640
- Refactor Gitlab::Merge · 122769e3
  Riyad Preukschas authored Oct 20, 2012
```
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
```
  122769e3
18 Oct, 2012 4 commits
- add shared repository doc. · 51ef5b92
  Saito authored Oct 18, 2012
  
  51ef5b92
- Merge pull request #1712 from riyad/use-gem-for-emoji · c0073254
  Dmitriy Zaporozhets authored Oct 18, 2012
```
Use gem for Emoji
```
  c0073254
- Merge pull request #1695 from riyad/cleanup-note-observer-and-notifications · 61e5fb6f
  Dmitriy Zaporozhets authored Oct 18, 2012
```
Code cleanup on NoteObserver and Notify
```
  61e5fb6f
- Merge pull request #1727 from gitlabhq/fix_bug_wiki · ca42e91e
  Dmitriy Zaporozhets authored Oct 18, 2012
```
Fix 500 error when project is empty
```
  ca42e91e
17 Oct, 2012 16 commits
- Rename NoteObserver methods and clarify things · 413778b6
  Riyad Preukschas authored Oct 13, 2012
  
  413778b6
- Reorder and group methods in Notify mailer · 853c69c4
  Riyad Preukschas authored Oct 13, 2012
  
  853c69c4
- Fix use of Emoji · ce910147
  Riyad Preukschas authored Oct 16, 2012
  
  ce910147
- Remove old Emoji code and images · 5d42d92c
  Riyad Preukschas authored Oct 16, 2012
  
  5d42d92c
- Add gemoji gem · b42c53c2
  Riyad Preukschas authored Oct 16, 2012
  
  b42c53c2
- Fix 500 error when project is empty · 883d138f
  Valeriy Sizov authored Oct 17, 2012
  
  883d138f
- Fixing broken test of project last_activity · db469ea3
  randx authored Oct 17, 2012
  
  db469ea3
- Added project has_one :last_event assoc. Fixed tab line-height after... · e0c43c46
  randx authored Oct 17, 2012
```
Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard
```
  e0c43c46
- v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog · a9a3480d
  randx authored Oct 17, 2012
  
  a9a3480d
- revert all wiki changes · 8e989d48
  Valeriy Sizov authored Oct 17, 2012
  
  8e989d48
- revert · 7a0a552b
  Valeriy Sizov authored Oct 17, 2012
  
  7a0a552b
- Wiki style: move styles to right place · 31f1cebe
  Valeriy Sizov authored Oct 17, 2012
  
  31f1cebe
- Wiki Style Fixing · 607d8b79
  Valeriy Sizov authored Oct 17, 2012
  
  607d8b79
- Merge pull request #1715 from riyad/use-font-awesome · 71667390
  Valeriy Sizov authored Oct 17, 2012
```
Use Font Awsome for icons
```
  71667390
- Merge pull request #1719 from SaitoWu/features/sharedRepository · d8262573
  Valeriy Sizov authored Oct 17, 2012
```
add shared repository support
```
  d8262573
- add shared repository support · 83626d05
  Saito authored Oct 17, 2012
  
  83626d05
16 Oct, 2012 15 commits
- WebEditor: Cancel button. Confirm #1705 · 372220d3
  Valeriy Sizov authored Oct 17, 2012
  
  372220d3
- WebEditor: rename button save -> commit #1705 · 234eb7a8
  Valeriy Sizov authored Oct 17, 2012
  
  234eb7a8
- WebEditor: show branch #1705 · ec05d9da
  Valeriy Sizov authored Oct 17, 2012
  
  ec05d9da
- Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons · d21443d1
  Valeriy Sizov authored Oct 16, 2012
```
Fix issue close and reopen button text and styles
```
  d21443d1
- WebEditor: fix unknown theme in production mode · 8ee8f36f
  Valeriy Sizov authored Oct 16, 2012
  
  8ee8f36f
- Import Font Awesome styles · 789e4b84
  Riyad Preukschas authored Oct 16, 2012
  
  789e4b84
- Add font-awesome-sass-rails gem · 30a31d63
  Riyad Preukschas authored Oct 16, 2012
  
  30a31d63
- Fix issues close and reopen button text and styles · fa4c38f3
  Riyad Preukschas authored Oct 16, 2012
  
  fa4c38f3
- Merge pull request #1704 from riyad/small-file-edit-fixes · 2a750bf2
  Valeriy Sizov authored Oct 16, 2012
```
Small fixes for editing files
```
  2a750bf2
- Only allow editing text files · 8e8d82d4
  Riyad Preukschas authored Oct 15, 2012
  
  8e8d82d4
- Improve flash messages in tree#update · ad5a6a4a
  Riyad Preukschas authored Oct 16, 2012
  
  ad5a6a4a
- tree.readme method added · 76e1ca64
  randx authored Oct 16, 2012
  
  76e1ca64
- Fix plain text readme · 453b2ae6
  randx authored Oct 16, 2012
  
  453b2ae6
- Merge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency · e8d6c3c1
  Dmitriy Zaporozhets authored Oct 15, 2012
```
Refactor tree views and improve consistency
```
  e8d6c3c1
- Merge pull request #1707 from riyad/remove-labels-from-mr-form · 5509093f
  Dmitriy Zaporozhets authored Oct 15, 2012
```
Remove redundant branch labels from MR form
```
  5509093f
15 Oct, 2012 2 commits
- Make history link for trees look like action links for blobs · 866b9f6d
  Riyad Preukschas authored Oct 16, 2012
  
  866b9f6d
- Remove redundant branch labels from MR form · 763022d6
  Riyad Preukschas authored Oct 16, 2012
```
Fixes #1525
```
  763022d6