Commits · c3a7d3e14727b8ba7c13cc7e48bc07648dc9fb74 · Jérome Perrin / gitlab-ce

16 Jul, 2014 1 commit
- Link to issues with # · c3a7d3e1
  Sytse Sijbrandij authored Jul 16, 2014
  
  c3a7d3e1
15 Jul, 2014 1 commit
- Split work to the 17th and make issue template. · e043da13
  Sytse Sijbrandij authored Jul 15, 2014
  
  e043da13
14 Jul, 2014 10 commits
- Milestone is closed only if all milestones are closed. · 275a5281
  Marin Jankovski authored Jul 14, 2014
  
  275a5281
- Merge branch 'branches_with_no_parent' into 'master' · d9bc57d1
  Dmitriy Zaporozhets authored Jul 14, 2014
```
Branches with no parent cannot be merged

Solves `undefined method 'reduce' for false:FalseClass`

Fixes #1415

See merge request !967
```
  d9bc57d1
- Merge branch 'satellite_chdir' into 'master' · bbef0ae0
  Dmitriy Zaporozhets authored Jul 14, 2014
```
Remove thread-unsafe Dir.chdir from Satellite#lock

See merge request !968
```
  bbef0ae0
- Merge pull request #7131 from skv-headless/per_request_rules_caching · 2099aa38
  Dmitriy Zaporozhets authored Jul 14, 2014
```
per request project rules caching
```
  2099aa38
- Merge pull request #7196 from cirosantilli/patch-2 · c50f8951
  Dmitriy Zaporozhets authored Jul 14, 2014
```
Enforce md style.
```
  c50f8951
- Remove thread-unsafe Dir.chdir from Satellite#lock · 99e1f488
  Jacob Vosmaer authored Jul 14, 2014
```
This is made possible by changes in gitlab-grit 2.6.10.
```
  99e1f488
- Error message needs to be correct. · 7435b879
  Marin Jankovski authored Jul 14, 2014
  
  7435b879
- Branches without parent commit cannot be merged. · 207bc8a0
  Marin Jankovski authored Jul 14, 2014
  
  207bc8a0
- Restore blue color for sign-in button · 25c9bf4b
  Dmitriy Zaporozhets authored Jul 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  25c9bf4b
- Merge pull request #7285 from jvanbaarsen/fixed-wrong-permission · 8ecbfe3d
  Dmitriy Zaporozhets authored Jul 14, 2014
```
A Developer cannot manage milestones
```
  8ecbfe3d
13 Jul, 2014 2 commits

Merge branch 'improve-login-page' into 'master' · d8ac75a2

Dmitriy Zaporozhets authored Jul 13, 2014

Improve login page

* use max-width for brand logo to prevent stretch of small images
* improve default brand logo to be centred on any kind of screen
* hide logo for small screens
* hide text for xs screens
* reduce amount of text on sign-in page

Fixes #1423

See merge request !966

d8ac75a2

Improve login page behaviour · 62d2aed0
Dmitriy Zaporozhets authored Jul 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
62d2aed0

11 Jul, 2014 17 commits
- Merge branch 'redirect_on_signin' into 'master' · 8da8efb3
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Redirect on signin

Fixes #1346

See merge request !965
```
  8da8efb3
- Add in the tests. · 3b80d68f
  Marin Jankovski authored Jul 11, 2014
  
  3b80d68f
- Use devise stored_location to redirect after signing for both public and private pages. · 07b9d806
  Marin Jankovski authored Jul 11, 2014
  
  07b9d806
- Revert "Merge branch 'redirect_after_login' into 'master'" · 55efb2d9
  Marin Jankovski authored Jul 07, 2014
```
This reverts commit 5aaa3565, reversing
changes made to 5b8c1767.
```
  55efb2d9
- Make brand image fill 100% width of space · f3b0cb77
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f3b0cb77
- Add bottom links for sign-in page so I can get to Public area · 248b1283
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  248b1283
- Rename brand helper · 8c15fd00
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8c15fd00
- Merge branch 'ee-login-layout' into 'master' · 849985a6
  Dmitriy Zaporozhets authored Jul 11, 2014
```
EE login layout

Port login layout from EE

See merge request !964
```
  849985a6
- Small fixes for sign-in page text · 5c51e483
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5c51e483
- Less distracting git clone line for public page · ba5787c3
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ba5787c3
- Improve signin/signup/reset pages UI · 6d332ce1
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6d332ce1
- Add box shadow to login box · f4fbc7b9
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f4fbc7b9
- Improve login page for small screens · 853ce954
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  853ce954
- Fix brand logo · ce30172c
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ce30172c
- Use same login layout between CE and EE versions · b93c1a56
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b93c1a56
- Merge branch 'update-architecture-diagram' into 'master' · a66d6a52
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Update architecture diagram

Update the diagram and make clear that rails accesses the repo's via shell.

When done submit to partner.

See merge request !962
```
  a66d6a52
- Merge branch 'escape-before-autolink' into 'master' · fa4c7f76
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Escape before autolink

Because auto_link set description to html_safe but dont escape html!!! :(

See merge request !963
```
  fa4c7f76
10 Jul, 2014 9 commits
- Updated the picture based on comments. · 6d0bfc92
  Sytse Sijbrandij authored Jul 10, 2014
  
  6d0bfc92
- Add html_escape to project description. auto_link set description to html_safe... · 1218a5e6
  Dmitriy Zaporozhets authored Jul 11, 2014
```
Add html_escape to project description. auto_link set description to html_safe but! dont escape html :(.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1218a5e6
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · a019b49a
  Dmitriy Zaporozhets authored Jul 10, 2014
  
  a019b49a
- Merge branch 'upgrade_devise' into 'master' · 6bc32fe4
  Dmitriy Zaporozhets authored Jul 10, 2014
```
Upgrade devise from 3.0.4 to 3.2.4

See merge request !960
```
  6bc32fe4
- Override strong params for sign up. · 60cc1d8e
  Marin Jankovski authored Jul 10, 2014
  
  60cc1d8e
- Update the diagram and make clear that rails accesses the repo's via shell. · 2df7a7b2
  Sytse Sijbrandij authored Jul 10, 2014
  
  2df7a7b2
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 20616c5a
  Dmitriy Zaporozhets authored Jul 10, 2014
  
  20616c5a
- Merge branch 'rework-counters' into 'master' · 7a914e5a
  Dmitriy Zaporozhets authored Jul 10, 2014
```
Rework counters

* Use one style for counters in sidebar
* show amount of assigned/authored/all entities in sidebar
* fixes UI overflow for small screens

See merge request !961
```
  7a914e5a
- Show counters in sidebar filter in same way like we did for projects page · cff17584
  Dmitriy Zaporozhets authored Jul 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cff17584