Commit Graph
761 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 45bebd76d6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-21 15:56:29 -08:00
Dmitriy Zaporozhets e5d491b7c7 Merge pull request #7389 from skv-headless/show-submodules-in-diff
show diff in submodules
2015-01-21 11:53:09 -08:00
Dmitriy Zaporozhets 2395b8f079 Merge branch 'show_tags_in_commit_view' into 'master'
Show tags in commit view

### What does this MR do?
With this MR you can see the assigned tags for a commit in the commit view.
### Are there points in the code the reviewer needs to double check?
I don't think so. But it would be awesome if the reviewer can tell me how to add a tag to the sample_commit in spec/support/repo_helpers.rb.
Then I can add a test for the new tag_names_contains method as soon as possible :)

### Why was this MR needed?
At the moment if one click on a commit will see details such as: parent commit, amount of additions, deletions, but will not see if this commit has Tag linked to it.
Showing branch, tag details will give better overview about the commit

### What are the relevant issue numbers / Feature requests?
Feature request: http://feedback.gitlab.com/forums/176466-general/suggestions/3962044-show-tags-in-commit-view
### Screenshots
![gitlab_feature_show_tags](https://gitlab.com/uploads/haynes/gitlab-ce/771c1a36bb/gitlab_feature_show_tags.png)

@dblessing Can you take a look at this MR as well please?

See merge request !297
2015-01-21 18:23:46 +00:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Headless 3d2aaa169e show diff in submodules 2015-01-19 17:18:08 +03:00
Dmitriy Zaporozhets 3e17d15661 Improve edited ago helpers 2015-01-18 19:39:29 -08:00
Dmitriy Zaporozhets ab651ef45c Merge branch 'syntax_highlight_diff_email' into 'master'
Add syntax colors to diffs in email-on-push notifications

## What does this MR do?
This MR adds syntaxhighlighting to the email-on-push notifications.
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Currently the diff in email-on-push notifications is just a monochrome diff that's hard to read.
This MR adds colored syntaxhighlighting to the mails.
## What are the relevant issue numbers / Feature requests?
* It closes https://github.com/gitlabhq/gitlabhq/issues/6994
* There is a Discussion in the Feedback Forum: http://feedback.gitlab.com/forums/176466-general/suggestions/5802256-add-color-to-diffs-in-email-on-push-service-to-htm
* A pull request for this already existed, but was closed. https://github.com/gitlabhq/gitlabhq/pull/7739

## Screenshots
see prior Pull Request for a screenshot

See merge request !295
2015-01-18 19:16:32 +00:00
Dmitriy Zaporozhets 539be2441a Merge pull request #8176 from yglukhov/stability-fix
Stability improvement
2015-01-18 10:36:26 -08:00
Hannes Rosenögger 8243eb3f0e Show tags in commit view 2015-01-17 19:22:35 +01:00
Hannes Rosenögger e460e04e16 Add Diff syntax colors for email-on-push notifications 2015-01-17 19:19:28 +01:00
Dmitriy Zaporozhets 41d7be3ce1 Allow to specify home page for non logged-in users 2015-01-16 16:01:15 -08:00
Dmitriy Zaporozhets 11591573e1 Merge pull request #7925 from cirosantilli/unused-arguments
Remove or prepend underscore _ to unused method arguments
2015-01-15 14:42:03 -08:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer'
Conflicts:
	app/helpers/projects_helper.rb
2015-01-13 10:35:16 -08:00
yglukhov c13f420b66 First entry in wiki history leads to newest revision. 2015-01-13 12:17:05 +02:00
Dmitriy Zaporozhets 4666515538 Merge branch 'flatten-dirs' into 'master'
Flatten the directory hierarchy while there is only one directory descendant

In some languages, especially java, the directory structure reflects the package structure.This means that using the file tree browser to reach the directories that matter you have to click a lot of directories containing only another subdirectory.

This merge request tries to enhance this by showing and providing the link to the first directory that doesn't contain only one directory.

See also [this feature request](http://feedback.gitlab.com/forums/176466-general/suggestions/6236769-jump-forward-to-the-first-folder-that-has-more-tha)

This is very similar to what [GitHub does](https://github.com/blog/1877-folder-jumping), but I don't think graying out the empty directories is really necessary.

Screenshots: [Before](https://gitlab.com/uploads/marmis85/gitlab-ce/b683a0000f/before.png) - [After](https://gitlab.com/uploads/marmis85/gitlab-ce/a23725a1c1/after.png)

I'm actually very new at ruby, rails, haml, and almost everything involved in Gitlab's development...
From what I could understand, when we render each directory item in the list we only have the data structure representing the item but not his descendants.
To iterate through the hierarchy I call Gitlab::Git:Tree.where() but I'm not sure if this is the most efficient way.

I also considered making every directory a clickable link, but I tried that and in the end it wasn't very useful and reduced the click target for the most useful directory.

See merge request !275
2015-01-11 04:42:28 +00:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets 08c9cb4cab Finally fix stuff related to dynamic config 2015-01-08 14:26:43 -08:00
Dmitriy Zaporozhets 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Dmitriy Zaporozhets 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Dmitriy Zaporozhets d02a22ba21 Redesign signin/singup pages 2015-01-07 17:07:36 -08:00
Dmitriy Zaporozhets b8f48bf414 Restyle and refactor dashboard projects page filtering 2015-01-06 13:09:56 -08:00
Dmitriy Zaporozhets 4165426725 Restyle and refactor milestones filter 2015-01-06 12:32:04 -08:00
marmis85 021cff67f3 Flatten the directory hierarchy while there is only one directory descendant 2014-12-31 03:15:04 +01:00
Dmitriy Zaporozhets 0991d19c0d Merge branch 'user_ssh_keys_on_admin' into 'master'
User ssh keys on admin

Show user ssh keys on admin user page.

See merge request !1362
2014-12-30 12:02:16 +00:00
Marin Jankovski 607ea7c6e5 Share the key table between admin and profile resources. 2014-12-30 11:01:30 +01:00
Dmitriy Zaporozhets 27ee0fc57b Helper for ajax group selectbox
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-30 11:46:47 +02:00
Dmitriy Zaporozhets 3d3c7e743f Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	app/assets/stylesheets/generic/common.scss
2014-12-28 22:13:31 +02:00
Ciro Santilli 6c65b91d8c Remove or prepend _ to unused method arguments 2014-12-27 22:38:25 +01:00
Dmitriy Zaporozhets 465f186954 Show assigned issues/mr be default on dashboard
This was default before but now it fixed with providing assignee_id
parameter making url shareble and dont reset when other filters users.

Also this commit removes old methods that are not used any more.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-26 18:33:53 +02:00
Dmitriy Zaporozhets d2bd5e833f Fix nav_link support for several path options
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 20:51:07 +02:00
Dmitriy Zaporozhets 5140a4cd13 Set of UI changes mostly for issue and merge request
* return edit/close buttons to old position (right of title)
* make 'Issue #1' header smaller
* move mr commits to separate tab
* change inline/side diff switcher to buttons from tabs
* make issue sidebar start with dicsussion block

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 14:32:49 +02:00
uranandyglukhov 19109a9458 Stability improvement 2014-12-24 23:18:30 +02:00
Francesco Coda Zabetta 84b40a346a check browser version, blacklisting outdated IE (version < 10) 2014-12-24 16:22:08 +01:00
Dmitriy Zaporozhets dc24b4d7a2 Merge branch 'sidebar-nav' into 'master'
Sidebar navigation

This MR changes layout of the GitLab to sidebar navigation.

Layouts:

- [x] Project layout
- [x] Project settings layout
- [x] Dashboard layout
- [x] Profile layout
- [x] Group layout
- [x] Snippets layout
- [x] Admin layout

Pages:

- [x] Activity pages
- [x] Issue/mr pages
- [x] Issues/merge requests pages

Common:

- [x] Fix tests

See merge request !1329
2014-12-24 13:18:43 +00:00
Dmitriy Zaporozhets 47634e392f Refactor issues and merge requests lists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23 18:49:39 +02:00
Dmitriy Zaporozhets 32eb5de510 One column issue/mr lists for project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23 17:31:38 +02:00
Dmitriy Zaporozhets 90ed76ac3c Prevent 500 after merge MR if you check remove source branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23 11:22:12 +02:00
Dmitriy Zaporozhets a2d188f688 Render MR diff full size of screen
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22 20:36:15 +02:00
Dmitriy Zaporozhets e45e6ba2c3 Merge branch 'master' into sidebar-nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/group.html.haml
2014-12-21 01:20:51 +02:00
Dmitriy Zaporozhets e007d810c9 Merge pull request #7886 from cirosantilli/disable-blob-edit-mr
Disable / hide MR edit blob button if cannot edit.
2014-12-20 20:19:38 +02:00
Dmitriy Zaporozhets 06a219baa5 Restyle group page and event filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-16 18:15:48 +02:00
Dmitriy Zaporozhets f3f27fee88 Left-side navigation for group layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-16 16:58:15 +02:00
Drew Blessing f06f69b9da Add theme type css class 2014-12-15 13:21:26 -06:00
Dmitriy Zaporozhets d31d711a70 DRY and refactor atom code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 22:14:20 +02:00
Dmitriy Zaporozhets e1f1e062a8 Merge branch 'multi_provider' into 'master'
Supporting for multiple omniauth provider for the same user

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721

and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760

See merge request !1296
2014-12-04 16:03:04 +00:00
Valery Sizov b56b96d438 added helper 2014-12-04 13:03:55 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Valery Sizov 1a80d13a39 Multi-provider auth. LDAP is not reworked 2014-12-04 13:01:50 +02:00
Dmitriy Zaporozhets 6670c99487 Set proper filter words
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 12:12:51 +02:00