home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,969 Commits 48 Branches 340 Tags
575ae806477edeb4e4c662560fb4ebca0773edad
Commit Graph
14969 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kingcody 575ae80647 fix(style): align navbar-toggle 
Changes:
- change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;`
 2015-03-19 05:14:50 -04:00
Dmitriy Zaporozhets 6c1074e302 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 22:56:29 -07:00
Dmitriy Zaporozhets a5bfd568f0 Merge branch 'remove-signin-flash' into 'master' 
Remove success signin message by devise

I find it really annoying every time I login into GitLab it shows me
that I successfully signed in. But this makes no sense to me. I already
see dashboard and dont see login screen. Its obvious I signed in
successfully. Instead it just show annyoing message every time taking
part of space on my screen.

See merge request !401
 2015-03-19 05:56:02 +00:00
Dmitriy Zaporozhets 4595d5bf4a Merge branch 'show_test_settings_button' into 'master' 
Show test settings as disabled when service cannot be tested.

See merge request !1725
 2015-03-19 05:24:40 +00:00
Marin Jankovski 5aa97ce91b Show test settings as disabled when service cannot be tested. 2015-03-18 21:47:17 -07:00
Dmitriy Zaporozhets f3d5046196 Return compare code button to top of sidebar 2015-03-18 21:32:23 -07:00
Dmitriy Zaporozhets 64f5d6ddf0 Remove signout flash message because it also makes no sense. 
You get redirected after signuout to gitlab.com and see this message on login page which makes no sense.
 2015-03-19 04:26:36 +00:00
Dmitriy Zaporozhets 1f835a81a7 Remove success signin message by devise 
I find it really annoying every time I login into GitLab it shows me
that I successfully signed in. But this makes no sense to me. I already
see dashboard and dont see login screen. Its obvious I signed in
successfully. Instead it just show annyoing message every time taking
part of space on my screen.
 2015-03-18 21:20:43 -07:00
Dmitriy Zaporozhets fa7ee3ade8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 21:16:43 -07:00
Dmitriy Zaporozhets 3ab7933cc8 Merge branch 'improve-ui' into 'master' 
Improve UI

* Improve group rename warning
* Refactor select css. Make selects same width

See merge request !400
 2015-03-19 04:16:28 +00:00
Dmitriy Zaporozhets ba39ca9f4a Fix project name overflow on dashboard 2015-03-18 21:05:39 -07:00
Dmitriy Zaporozhets 3948441171 Update CHANGELOG with selectbox refactoring 2015-03-18 20:48:32 -07:00
Dmitriy Zaporozhets e25b1107c8 Refactor select css. Make selects same width 2015-03-18 20:46:26 -07:00
Dmitriy Zaporozhets 7413edd466 Merge branch 'improve-diffs' into 'master' 
Improve diffs UI

* replace big button with simple toggle for diff comments
* replace diff stats button with link

See merge request !399
 2015-03-19 03:44:13 +00:00
Dmitriy Zaporozhets b908d00f5b Improve group rename warning 2015-03-18 20:16:36 -07:00
Dmitriy Zaporozhets 1cf138170c Add tooltip for comment toggle in diff. Add changelog item and fix tests 2015-03-18 20:12:19 -07:00
Dmitriy Zaporozhets e07d32eb41 Add some space aroung diff stats block 2015-03-18 19:21:24 -07:00
Dmitriy Zaporozhets 22038106b4 Replace show diff button with link 2015-03-18 19:11:27 -07:00
Dmitriy Zaporozhets e0f8e022f7 Improve comment toggle button in diff 2015-03-18 17:53:43 -07:00
Dmitriy Zaporozhets e7e329d364 Fix link to project from fork 2015-03-18 16:17:30 -07:00
Marin Jankovski 7ed6da5454 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-18 13:57:30 -07:00
Marin Jankovski 63f7129483 Move application setting to separate variable. 2015-03-18 13:55:41 -07:00
Marin Jankovski 50b6c66129 Merge branch 'more-nil-visibility-fixes' into 'master' 
Handle nil restricted visibility settings

Return `true` from `non_restricted_level?` when the `restricted_visibility_levels` setting is nil.  This addresses #2154.

cc @sytse

See merge request !1724
 2015-03-18 20:47:31 +00:00
Jeroen van Baarsen 74a8090656 Merge pull request #8971 from jvanbaarsen/guard-bin-stub 
Added binstub for guard
 2015-03-18 19:51:50 +01:00
Vinnie Okada e535d21768 Handle nil restricted visibility settings 
Return `true` from `non_restricted_level?` when the
`restricted_visibility_levels` setting is nil.
 2015-03-18 12:50:27 -06:00
Dmitriy Zaporozhets 0eaabc2708 Revert "Note: add default_scope { order(created_at: :asc, id: :asc) }" 
This reverts commit 7602cef572.
 2015-03-18 11:42:03 -07:00
Jeroen van Baarsen 1446af25b1 Added binstub for guard 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-03-18 19:35:38 +01:00
Dmitriy Zaporozhets b5e961eb4c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 11:15:27 -07:00
Dmitriy Zaporozhets b5b2055cca Merge branch 'fix-mr-push-range' into 'master' 
Fix condensed range in MR push comment.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1246

In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/326#note_984907, you see that the compare page doesn't actually have 39 commits because we're using `first_new_commit^`, which is not always the same as `oldrev`. With this MR, we use `oldrev` instead, which will always work.

See merge request !1721
 2015-03-18 18:15:24 +00:00
Douwe Maan 5994b036d2 Merge branch 'api-sort-merge-request-comments' into 'master' 
Api: sort merge_request comments

Add default_scope { order(created_at: :asc, id: :asc) } in Note so comments are sorted when fetched through api.

See merge request !256
 2015-03-18 18:08:40 +00:00
Dmitriy Zaporozhets d03d636304 Merge branch 'changelog-link' into 'master' 
Add changelog, license and contribution guide links to project sidebar.

If the version is known, the "Version: 7.9.0pre" button links to the changelog, otherwise a "View changelog" button is shown.

![Screen_Shot_2015-03-18_at_14.22.29](https://dev.gitlab.org/gitlab/gitlabhq/uploads/747acc018ec9a188098e0f0bc4e91cc3/Screen_Shot_2015-03-18_at_14.22.29.png)

See merge request !1708
 2015-03-18 18:02:39 +00:00
Dmitriy Zaporozhets a0c513bb4e Merge branch 'bump-gitlab-git' into 'master' 
Bump gitlab_git to 7.1.2

For https://dev.gitlab.org/gitlab/gitlabhq/issues/2151

See merge request !1722
 2015-03-18 17:58:56 +00:00
Dmitriy Zaporozhets fec5f807bb Merge branch 'new-branch-commits' into 'master' 
List new commits for newly pushed branch in activity view.

When someone pushes commits, I want to see them, regardless if it's a new or existing branch. If it's a new branch, we compare with the default branch (usually master).

![Screen_Shot_2015-03-17_at_15.49.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4cb7e0d833bc83a30197db81d4b273bc/Screen_Shot_2015-03-17_at_15.49.13.png)

See merge request !1711
 2015-03-18 17:47:02 +00:00
Dmitriy Zaporozhets 85d226e57f Bump gitlab_git to 7.1.2 2015-03-18 10:25:22 -07:00
Dmitriy Zaporozhets 1646bfc273 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 09:24:43 -07:00
Dmitriy Zaporozhets c31628fc00 Merge branch 'order_in_settings_page' into 'master' 
Fix the order of signin and signup on features page.

See merge request !1720
 2015-03-18 16:24:34 +00:00
Samuel Bernard 7602cef572 Note: add default_scope { order(created_at: :asc, id: :asc) } 2015-03-18 17:06:17 +01:00
Douwe Maan ebfc7d052b Fix condensed range in MR push comment. 2015-03-18 16:37:29 +01:00
Marin Jankovski ce8359c151 Fix the order of signin and signup on features page. 2015-03-18 08:25:50 -07:00
Douwe Maan b1b8261f56 Add license and contribution guide links to project sidebar. 2015-03-18 16:17:43 +01:00
Douwe Maan 9d938fd77d List new commits for newly pushed branch in activity view. 2015-03-18 14:28:50 +01:00
Douwe Maan 5adb1128dc Show changelog link even if no version is known. 2015-03-18 14:08:26 +01:00
Douwe Maan d328b4166e Fix tree readme. 2015-03-18 14:08:26 +01:00
Douwe Maan 6581aea3bf Link project version to changelog if there is one. 2015-03-18 14:08:26 +01:00
Douwe Maan 31e484085a Find tree readme lazily. 2015-03-18 14:08:26 +01:00
Douwe Maan 88f9ed3d19 Move finding of contributing file from tree to repository. 2015-03-18 14:08:26 +01:00
Douwe Maan 1f21dfaeab Merge branch 'commit_calendar_activity' into 'master' 
Extend commit calendar to actually show what commits were made on a date

## What does this MR do?
This MR extends the commit calendar so it acutally shows what commits were made on a date and in which project.
It is based on the optimizations @dzaporozhets made for the calendar.

## Are there points in the code the reviewer needs to double check?
The UI and how the links are generated i guess. That feels hacky at the moment :/

## Screenshot:
![commit_calendar_extend_display](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5bf1631660/commit_calendar_extend_display.png)

I assume that i have to refactor this a bit more to make it a cleaner implementation, so please give me feedback on what needs to be changed :)

See merge request !326
 2015-03-18 13:05:07 +00:00
Douwe Maan 5c4d6606c7 Merge branch 'line_wrap_default' into 'master' 
Enable line wrapping per default.

This MR enables line wrapping by default and removes the checkbox to toggle it.

Let's be honest, noone likes horizontal scrollbars.

/cc @dzaporozhets @DouweM As discussed yesterday. Please take a look. Did I miss something?
The change feels to easy 😄

See merge request !396
 2015-03-18 13:01:32 +00:00
Hannes Rosenögger 120f032b1a enable line wrapping by default and remove the checkbox to change it 2015-03-18 08:46:53 +01:00
Hannes Rosenögger 9e5738b007 Extend the commit calendar to show the actual commits for a date 2015-03-18 08:42:42 +01:00