delta/gitlab/gitlab-ce.git, branch fix-gitorious-importer gitlab.com: gitlab-org/gitlab-ce.git Get Gitorious importer to work again. 2015-04-24T21:30:12+00:00 Douwe Maan douwe@gitlab.com 2015-04-24T21:30:12+00:00 c2f11f32095f67414eab1efe932c8df8ec01c22f 






Merge branch 'fix-slack-channel-in-admin-settings' into 'master'
2015-04-24T16:32:09+00:00

Douwe Maan
douwe@gitlab.com

2015-04-24T16:32:09+00:00

439b9f50af3168d33169a4cd25b59e45ea46dc62

Fix bug where Slack service channel was not saved in admin template settings

Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.

Closes https://github.com/gitlabhq/gitlabhq/issues/9181
Closes #1501

See merge request !574





Fix bug where Slack service channel was not saved in admin template settings

Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.

Closes https://github.com/gitlabhq/gitlabhq/issues/9181
Closes #1501

See merge request !574







Merge branch 'rs-simplify-uploads-controller' into 'master'
2015-04-24T16:26:32+00:00

Robert Speicher
robert@gitlab.com

2015-04-24T16:26:32+00:00

ea9089647ce789f36ecb2b1a0de1ce028ccf6ff0

Simplify the `skip_before_action` logic for UploadsController

See merge request !547





Simplify the `skip_before_action` logic for UploadsController

See merge request !547







Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-04-24T16:02:26+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-04-24T16:02:26+00:00

54d7962fb434538eba6fee243cadec375a4893c7












Merge branch 'mobile-ui-improvements' into 'master'
2015-04-24T16:01:10+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-04-24T16:01:10+00:00

34e14b1ca7cc38278ccd2aa63b9368a423716558

Improve mobile UI for dashboard and project pages

Some love for mobile UI :smiley:

## Before
- - -
![Screenshot_2015-04-24-17-42-59](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/827f9cefa477fc7f0d1b2d56e479a35c/Screenshot_2015-04-24-17-42-59.png)
![Screenshot_2015-04-24-17-27-01](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/698eb90033d40ea7de9f599364a34d0e/Screenshot_2015-04-24-17-27-01.png)

## After
- - -

![Screenshot_2015-04-24-17-16-08](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/7e3ad8bc18800f63a7be20ea31ccfd3b/Screenshot_2015-04-24-17-16-08.png)
![Screenshot_2015-04-24-17-39-18](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/cde3379836530d95e94922ba5c200cef/Screenshot_2015-04-24-17-39-18.png)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !573





Improve mobile UI for dashboard and project pages

Some love for mobile UI :smiley:

## Before
- - -
![Screenshot_2015-04-24-17-42-59](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/827f9cefa477fc7f0d1b2d56e479a35c/Screenshot_2015-04-24-17-42-59.png)
![Screenshot_2015-04-24-17-27-01](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/698eb90033d40ea7de9f599364a34d0e/Screenshot_2015-04-24-17-27-01.png)

## After
- - -

![Screenshot_2015-04-24-17-16-08](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/7e3ad8bc18800f63a7be20ea31ccfd3b/Screenshot_2015-04-24-17-16-08.png)
![Screenshot_2015-04-24-17-39-18](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/cde3379836530d95e94922ba5c200cef/Screenshot_2015-04-24-17-39-18.png)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !573







Fix bug where Slack service channel was not saved in admin template settings.
2015-04-24T15:33:24+00:00

Stan Hu
stanhu@gmail.com

2015-04-24T15:33:24+00:00

2f045997516a11622a7c7229ac08ac0d288813df

Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.

Closes https://github.com/gitlabhq/gitlabhq/issues/9181





Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.

Closes https://github.com/gitlabhq/gitlabhq/issues/9181







Improve mobile UI for dashboard and project pages
2015-04-24T14:39:53+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-04-24T14:39:53+00:00

f912650ded0e9d02f008f8903563a71d9703838b

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Merge branch 'username-period-again' into 'master'
2015-04-24T14:16:08+00:00

Douwe Maan
douwe@gitlab.com

2015-04-24T14:16:08+00:00

b8c4215969a45370ad37a67a8a52d16d7eeecba4

Don't allow username to end in period.

Fixes #2174 and #2249.

cc @jacobvosmaer Please review and test with the GitLab.com dump.

See merge request !1786





Don't allow username to end in period.

Fixes #2174 and #2249.

cc @jacobvosmaer Please review and test with the GitLab.com dump.

See merge request !1786







Merge branch 'add_count_to_state_filters' into 'master'
2015-04-24T14:08:40+00:00

Marin Jankovski
marin@gitlab.com

2015-04-24T14:08:40+00:00

62117f2f25646009fb5b20d7a215d7d697ce3231

Add issue and merge request count for state filters.

Related to issue #2170

Changes relate to project issues and merge request pages, dashboard and group pages remain the same.

See merge request !1747





Add issue and merge request count for state filters.

Related to issue #2170

Changes relate to project issues and merge request pages, dashboard and group pages remain the same.

See merge request !1747







Merge branch 'canonical-source' into 'master'
2015-04-24T13:32:12+00:00

Dmitriy Zaporozhets
dzaporozhets@gitlab.com

2015-04-24T13:32:12+00:00

2a3b724cf8405b623c292252a98df2b44c7a21aa

Make source code on GitLab more prominent.

See merge request !1741





Make source code on GitLab more prominent.

See merge request !1741