提交 · a12d50c5e5ebba17e6e16d3d628f449caf24b6d2 · 李少辉-开发者 / gitlab-foss

23 4月, 2015 35 次提交
- D
  
  Remove unnecessary private_token params. · a12d50c5
  由 Douwe Maan 提交于 4月 23, 2015
  
  a12d50c5
- D
  
  Fix spec. · a8812dc1
  由 Douwe Maan 提交于 4月 21, 2015
  
  a8812dc1
- D
  
  Rename "News Feed" buttons to "Activity Feed" · cd450221
  由 Douwe Maan 提交于 4月 21, 2015
  
  cd450221
- D
  
  Fix project atom link tag. · 059cc164
  由 Douwe Maan 提交于 4月 21, 2015
  
  059cc164
- D
  
  Update changelog. · 713413a8
  由 Douwe Maan 提交于 4月 21, 2015
  
  713413a8
- D
  
  Make links and titles of atom feeds consistent. · 9c60354a
  由 Douwe Maan 提交于 4月 21, 2015
  
  9c60354a
- D
  
  Add atom feed for project activity. · a6dfd065
  由 Douwe Maan 提交于 4月 21, 2015
  
  a6dfd065
- D
  
  Move activity feed buttons out of event_filter into actual show views. · 72b090b8
  由 Douwe Maan 提交于 4月 21, 2015
  
  72b090b8
- D
  
  Add feed button to dashboard and group issue pages. · cba86eed
  由 Douwe Maan 提交于 4月 21, 2015
  
  cba86eed
- D
  
  Add atom link tag to every page that has one. · 8917ae39
  由 Douwe Maan 提交于 4月 21, 2015
  
  8917ae39
- D
  Fix sidebar collapse button · 27289599
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  27289599
- D
  Add CHANGELOG item for new sidebar · 96e4c780
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  96e4c780
- M
  Merge pull request #9042 from skburgart/fix/jira-link · ec350f0b
  由 Marin Jankovski 提交于 4月 23, 2015
```
Fix broken link in jira service
```
  ec350f0b
- M
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · cc8de0e5
  由 Marin Jankovski 提交于 4月 23, 2015
  
  cc8de0e5
- D
  Merge pull request #9062 from fgimian/omniauth-disable-turbolink · ac4968b9
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Disable turbolinks for omniauth link to avoid rendering problems
```
  ac4968b9
- D
  Merge branch 'sign-out-to-sign-in' into 'master' · d4fb062d
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Redirect to sign in page after signing out.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2125.

See merge request !541
```
  d4fb062d
- D
  Merge branch 'rs-rails-env-predicates' into 'master' · f9119150
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Fix two places where we should be using `Rails.env.development?`

See merge request !550
```
  f9119150
- D
  Merge branch 'issue-body-code-mentions' into 'master' · 285ae60c
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254.

See merge request !553
```
  285ae60c
- D
  Merge branch 'rs-search_text_nodes' into 'master' · 67996c1e
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Use `search_text_nodes` helper in our custom filters

Closes #1477

See merge request !561
```
  67996c1e
- D
  Merge branch 'new-sidebar' into 'master' · 1c96b0b9
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
New sidebar design

I want to make separation between sidebar and content

- [x] change sidebar and header colors
- [x] change colors for old light theme so it matches dark style too
- [x] rename theme names to something more reasonable
- [x] fix header logo collapse with JS
- [x] fix navless layouts (explore page, login page, snippets, user page)
- [x] fix tests

See merge request !558
```
  1c96b0b9
- D
  Merge branch 'master' into new-sidebar · 71f61435
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/snippets_controller.rb
```
  71f61435
- D
  Dont render dashbaord nav if user is not signed in · 63c59119
  由 Dmitriy Zaporozhets 提交于 4月 23, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  63c59119
- M
  Merge pull request #8996 from vinkla/patch-1 · aac27550
  由 Marin Jankovski 提交于 4月 23, 2015
```
Fix Node.js Error in Documentation
```
  aac27550
- M
  
  Move the upgrade document to the correct location. · 8b4d1b78
  由 Marin Jankovski 提交于 4月 23, 2015
  
  8b4d1b78
- V
  
  Fix nodejs installation guide in documentation. · 3a8bcea2
  由 Vincent Klaiber 提交于 3月 22, 2015
  
  3a8bcea2
- D
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · e3682122
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
  
  e3682122
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · 5b6e702e
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
  
  5b6e702e
- D
  Merge branch 'rs-reply-hotkey' into 'master' · a22f3139
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
```
"Reply quoting selected text" shortcut/hotkey

Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms.

This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs.

See merge request !1775
```
  a22f3139
- D
  Merge pull request #9078 from ikappas/project-services-extend-ui · b0c1e255
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
```
Add Fieldset Support to Project Services Views
```
  b0c1e255
- J
  Merge branch 'upgrader-for-7.10' into 'master' · b42ee44c
  由 Job van der Voort 提交于 4月 22, 2015
```
Update command in upgrader docs to work with 7.10.0.

See merge request !562
```
  b42ee44c
- D
  
  Update command in upgrader docs to work with 7.10.0. · 7d49b965
  由 Douwe Maan 提交于 4月 22, 2015
  
  7d49b965
- R
  Use `search_text_nodes` helper in our custom filters · fb5116ca
  由 Robert Speicher 提交于 4月 22, 2015
```
Closes #1477
```
  fb5116ca
- D
  Fix snippet test · 5f3b2be8
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5f3b2be8
- D
  For navless pages render dashboard nav · 28639a19
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  28639a19
- I
  added fieldset support to project and admin services views. · 3196c529
  由 Ioannis Kappas 提交于 4月 02, 2015
```
split field logic to separate template.
```
  3196c529
22 4月, 2015 5 次提交
- D
  Fix snippets tests · 47d26b05
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  47d26b05
- D
  
  Fix wording and remove duplicate link · 0261a5e2
  由 Dmitriy Zaporozhets 提交于 4月 02, 2015
  
  0261a5e2
- D
  
  Start applying new layout to snippets pages · 4a63573b
  由 Dmitriy Zaporozhets 提交于 4月 02, 2015
  
  4a63573b
- D
  Add gitlab logo on login page · 27919e25
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  27919e25
- D
  Restyle explore page to sidebar layout · c41a5bf3
  由 Dmitriy Zaporozhets 提交于 4月 22, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c41a5bf3