Commit Graph
14950 Commits
Author SHA1 Message Date
Douwe Maan a5a5ec970e Fewer constants, more helpers. 2015-03-19 10:34:04 +01: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
Dmitriy Zaporozhets dbd347bfa0 Merge branch 'fix_subscription' into 'master'
Fix public issue

See merge request !1717
2015-03-18 06:23:29 +00:00
Valery Sizov 847bd0d0e5 fix public issue 2015-03-18 02:16:10 -04:00
Dmitriy Zaporozhets 63d0bf1f5e Fix external wiki service 2015-03-17 22:59:45 -07:00
Dmitriy Zaporozhets 8aa2cd465c Merge branch 'refactor-css' 2015-03-17 22:57:58 -07:00
Dmitriy Zaporozhets 521785157b Remove to old GitLab colors for succes and primary 2015-03-17 22:48:00 -07:00
Dmitriy Zaporozhets 293553747a Cleanup bootstrap variable example file 2015-03-17 22:31:45 -07:00
Dmitriy Zaporozhets 2aaf685305 More use of sass variables. Reject flatly gray colors 2015-03-17 22:25:25 -07:00
Dmitriy Zaporozhets 066fb568e7 Align services like in EE for easier merging 2015-03-17 19:06:43 -07:00
Dmitriy Zaporozhets 0e70fbe333 Move CHANGELOG item to correct milestone 2015-03-17 19:01:36 -07:00
Dmitriy Zaporozhets 52acd2b45c Merge branch 'external_wiki' into 'master'
Add support for external wikis

## What does this MR do?
This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link.
Currently this is realised as a service.

## What Use Case does this MR solve?
In my Company we already have a wiki System (Confluence).
We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides.
This currently only leaves us two choices:
1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui.
2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one.

Both solutions are not really good.
So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab?
Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :)
This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki.

## Screenshot:
![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png)

See merge request !291
2015-03-18 02:00:36 +00:00
Dmitriy Zaporozhets cc4a3b6b62 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-17 18:38:37 -07:00
Dmitriy Zaporozhets aa4691acac Fix email template css for project moved emails 2015-03-17 18:38:10 -07:00
Dmitriy Zaporozhets b8b3f7f11c Merge branch 'css-vars' into 'master'
More actively use css variabled to prevent colors duplication

See merge request !1715
2015-03-18 01:37:04 +00:00
Dmitriy Zaporozhets 560a29e660 Merge branch 'replace-linux-with-gnu-linux' into 'master'
Replace linux with gnu linux

To recognize the work of Dr. Stallman.

See merge request !391
2015-03-18 01:26:39 +00:00
Dmitriy Zaporozhets f8c8d988e8 Fix scroll for last push widget 2015-03-17 18:13:20 -07:00
Dmitriy Zaporozhets d659c1d1fd More actively use css variabled to prevent colors duplication 2015-03-17 18:01:33 -07:00
Dmitriy Zaporozhets 5bbc70da9c Merge branch 'update-grack' into 'master'
Update Grack.

See merge request !1712
2015-03-18 00:15:04 +00:00
Dmitriy Zaporozhets d2979c778f Merge branch 'update-omniauth-ldap' into 'master'
Update omniauth-ldap.

See merge request !1713
2015-03-18 00:14:04 +00:00
Dmitriy Zaporozhets cb3b671839 Its time for 7.10.0.pre 2015-03-17 17:06:40 -07:00