Commits · 99a9d97c44a23aae4e712de45180ed362369ab11 · Kazuhiko Shiozaki / gitlab-ce

26 Mar, 2014 7 commits

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 99a9d97c
Dmitriy Zaporozhets authored Mar 26, 2014

99a9d97c

Merge branch 'request/monospace_gfm_input' into 'master' · fb74d4a9

Dmitriy Zaporozhets authored Mar 26, 2014

Use monospace fonts for GFM inputs

This is an MR for [this feedback suggestion](http://feedback.gitlab.com/forums/176466-general/suggestions/5593468-use-monospace-font-in-wiki-edit-content-textarea).

I'm not sure exactly where the best place for the fix is, but I opted for the typography.scss file.  Basically, all ``textarea.js-gfm-input`` elements are styled with ``font-family: $monospace_font;``.

*PS: this being my first MR to gitlab, I apologize if I missed any steps in the process; let me know what's missing and I'll correct it here & in future MRs*

fb74d4a9

Merge pull request #6569 from criteo/api_merge_request_comments · 17fd0e5c
Dmitriy Zaporozhets authored Mar 26, 2014
```
Add method to get the comments on a merge request
```
17fd0e5c
Time for 6.8.0pre · af0b59d4
Dmitriy Zaporozhets authored Mar 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
af0b59d4
Merge branch 'improve_at_mentions' into 'master' · eb7a9868
Dmitriy Zaporozhets authored Mar 26, 2014
```
Allow at mentions for people who are not members of the project
```
eb7a9868

Merge branch 'event-create-service' into 'master' · f0adf28e

Dmitriy Zaporozhets authored Mar 26, 2014

EventCreateService class

The goal is to collect all event creation logic in one place called EventCreateService.
Because now its placed in observers, controllers, services etc

f0adf28e

Merge branch 'refactor-author-id-of-changes' into 'master' · 05c9ab94
Dmitriy Zaporozhets authored Mar 26, 2014
```
Remove author_id_of_changes

To prevent confusion because we already have `current_user`
```
05c9ab94

25 Mar, 2014 33 commits
- Merge branch 'define-feature-request' into 'master' · 285ed337
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Define Feature Request in Process doc
```
  285ed337
- More strict wording of the bug criteria. · 74f16902
  dosire authored Mar 25, 2014
  
  74f16902
- Merge branch 'master' into define-feature-request · b2e74741
  dosire authored Mar 25, 2014
```
Conflicts:
	PROCESS.md
```
  b2e74741
- More compact event feed and projects list · 7f67e066
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7f67e066
- Revert "Clearfix on well-lists. Pages affected:" · e421772f
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Because it adds extra spaces at each project row on dashboard

This reverts commit 2767abd9.
```
  e421772f
- Add to changelog. · 9dd58c32
  Marin Jankovski authored Mar 25, 2014
  
  9dd58c32
- Version 6.7.2 · 5245fac6
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
```
  5245fac6
- Correct identation, default value if note doesn't exist. · d2630221
  Marin Jankovski authored Mar 25, 2014
  
  d2630221
- Search within project. · 12c3962f
  Marin Jankovski authored Mar 25, 2014
  
  12c3962f
- Extract sorting into a method. · 0a4283b5
  Marin Jankovski authored Mar 25, 2014
  
  0a4283b5
- Include commits. · eda2c0c6
  Marin Jankovski authored Mar 25, 2014
  
  eda2c0c6
- Allow referencing an existing user. · 02850210
  Marin Jankovski authored Mar 25, 2014
  
  02850210
- At mention participating users. · 01ec6c79
  Marin Jankovski authored Mar 25, 2014
  
  01ec6c79
- Merge pull request #6374 from zzet/patch-10 · 81527e9f
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Update merge_request_observer_spec.rb
```
  81527e9f
- Merge pull request #6554 from tsigo/remove-spork · 9afccaa8
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Remove Spork
```
  9afccaa8
- Merge pull request #6577 from tombruijn/group_projects_clearfix · a5d7d125
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Clearfix on .well-list
```
  a5d7d125
- Merge pull request #6586 from abner/master · a7aacb4d
  Dmitriy Zaporozhets authored Mar 25, 2014
```
added api method to return labels of a given project
```
  a7aacb4d
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 5fc3d746
  Dmitriy Zaporozhets authored Mar 25, 2014
  
  5fc3d746
- Add bottom margin to highlighed code block in comment/wiki · c21c3e57
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c21c3e57
- Fix tests · 535339a6
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  535339a6
- Merge pull request #5935 from nmoura/patch-1 · 306d4ee7
  Jacob Vosmaer authored Mar 25, 2014
```
Changed sudo by su -c in init script
```
  306d4ee7
- Fix MR observer · d4bfacc3
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d4bfacc3
- Remove activity observer specs · 45e6abff
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  45e6abff
- Use EventCreateService for notes, merge requests · ba87b76d
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ba87b76d
- Drop activity observer. User EventCreateService instead · 6cc4ac7b
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6cc4ac7b
- Add milestone observer · 12d08100
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  12d08100
- Collect all event creation logic in one place called EventCreateService · d89130b0
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d89130b0
- Remove author_id_of_changes from spec · cce80d04
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cce80d04
- Remove author_id_of_changes from app · f08464c0
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f08464c0
- Use current_user for Notification#merge_mr · 80daf9a7
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  80daf9a7
- Simplify run tests command · 8bbac457
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8bbac457
- Merge branch 'humanize-over-titleize' into 'master' · e320ee3f
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Use humanize instead of titleize for MR title suggestion
```
  e320ee3f
- Fix tests · 7847e108
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7847e108