Commit Graph
735 Commits
Author SHA1 Message Date
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
Ciro Santilli a56d0d47db Remove unneeded backslash: "\/" == "/" 2014-11-04 11:16:53 +01:00
Jan-Willem van der Meer a7e071e982 Add refactoring for multiple LDAP server support
These changes are ported from EE to CE. Apply changes for app directory
2014-10-13 13:39:54 +02:00
Dmitriy ZaporozhetsandJan-Willem van der Meer a756fd1ff6 Merge pull request #8020 from mr-vinn/note-trunc-link
Improve event note display in dashboard and project activity views
2014-10-13 13:01:57 +02:00
Vinnie Okada b3c70d001d Improve dashboard note view and add tests
Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.

Also add Rspec tests for `EventsHelper#event_note`.
2014-10-12 23:56:56 -05:00
Vinnie Okada 5b2a42a091 Preserve link href in truncated note view
Notes on the dashboard views are truncated to 150 characters; this
change ensures that when a link's text is truncated it still points to
the correct URL.
2014-10-12 14:52:17 -05:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Dmitriy Zaporozhets 74217f753f Apply ConfirmDangerModal for project transfer/remove actions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-08 13:57:54 +03:00
Dmitriy Zaporozhets ac7fab7311 Merge pull request #7938 from cirosantilli/factor-dashboard-helper
Factor dashboard helper methods.
2014-10-08 11:38:22 +03:00
Sytse Sijbrandij 3fff9aa34f Merge pull request #7981 from cirosantilli/www-to-about
Replace www.gitlab.com with about.gitlab.com
2014-10-08 09:46:51 +02:00
Dmitriy Zaporozhets 8fad7e63a3 Add a bit of space between star icon and text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-07 15:22:55 +03:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00