Commit Graph
747 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4a49a937cd Allow to specify home page for non logged-in users 2015-01-16 19:39:02 -08: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
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
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
Dmitriy Zaporozhets d80a59c7b1 Create helper for sort drowdown option names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 12:10:38 +02:00
Dmitriy Zaporozhets ba51a1dd32 Render cross reference in issue title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-03 11:15:00 +02:00
Dmitriy Zaporozhets f4b9a65c05 Merge branch 'reactivate-hljs-autodetection' into 'master'
Reactivate highlight.js language autodetection

### What does this MR do?

This commit partly reverts commit 0d13abb1 to reactivate highlight.js language autodetection.

It does NOT revert the part that adds the `nohighlight` CSS-class for a predefined set of filenames (which was indeed the intended purpose of commit 0d13abb1).

### Are there points in the code the reviewer needs to double check?

Not particularly, the only effect of this blob_helper is to add a CSS class to the `<pre>` container of the blob, to control the way highlight.js performs its syntax highlighting. (see where this helper is called at https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/shared/_file_hljs.html.haml#L12).

However this merge request DOES change the way the syntax highlighting is done (by bringing it back to the situation before commit 0d13abb1 where highlight.js autodetected the language itself). So we can expect some new kind of syntax highlighting problems. However in this case, the issues should be forwarded to the upstream project (https://github.com/isagalaev/highlight.js).

### Why was this MR needed?

The main motivation behind this partial revert is that there is no point (IMHO) in using an "intelligent" syntax highlighter which is specifically designed to autodetect languages if it is to dictate (via the CSS class) the language to use solely based on the filename extension.

### What are the relevant issue numbers / Feature requests?

Issue #665 "HLJS language autodetection / syntax highlighting fails "

### Screenshots (If appropriate)

See screenshots in issue #665

See merge request !232
2014-11-30 13:22:48 +00:00
Dmitriy Zaporozhets f9aead9f6e Hide gpg signature on tags page from tag message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-18 18:00:38 +02:00
ZertrinandMarc Gallet b8fcaa7f41 revert using the extension of the blob to determine the syntax highlighting language
nohighlight functionality for a hardcoded set of filenames is kept
2014-11-18 12:55:22 +01:00
Dmitriy Zaporozhets a4e98f0ec9 Merge branch 'fork-to-group' into 'master'
Fork to group

Fixes #1592

* project can be forked into group
* fork link always lead to fork page where you select namespace where to fork

See merge request !1253
2014-11-18 10:44:15 +00:00
Dmitriy Zaporozhets 2388fdd7c6 Improve fork to namespaces feature
* Show namespace thumbnail differently if project was already forked
* Show loading spinner when click on fork
* Fork link navigates to personal namespace only if no manageable groups exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-14 16:06:39 +02:00
Marin Jankovski ced2438312 Clean the string with commit author and email. 2014-11-14 11:08:58 +01:00
Dmitriy Zaporozhets 6adc313a1f Merge branch 'actions_in_the_inbox' into 'master'
Actions in the inbox

Related to #1607

See merge request !1247
2014-11-12 14:57:38 +00:00
Dmitriy Zaporozhets c58edd7c70 Merge branch 'add_issue_edited_timestamp' into 'master'
Add issue edited timestamp

Comments already have this feature.
So, I think, issues should also have it.
![Снимок экрана 2014-11-08 в 17.07.10](https://gitlab.com/uploads/vernik91/gitlab-ce/4e87a15130/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2014-11-08_%D0%B2_17.07.10.png)

See merge request !235
2014-11-12 11:02:25 +00:00
Marin Jankovski 857852ce04 Set action on issue/mr creation mail. 2014-11-12 11:59:57 +01:00
Marin Jankovski af15447867 Create emails helper for actions links. 2014-11-11 16:09:58 +01:00
Ben Bodenmiller 6ace931c35 make repo name link to repo homepage 2014-11-09 03:37:56 -08:00
Nikita Verkhovin 2148e1997a Add issue edited timestamp 2014-11-08 16:54:08 +06:00