Commit Graph
3638 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4e7de9492f Show modal window with instructions if GH OAuth is not enables 2015-01-22 19:00:31 -08:00
Dmitriy Zaporozhets e4a4358254 Small improvements to CI 2015-01-17 22:23:26 -08:00
Valery SizovandDmitriy Zaporozhets 20d10b6391 Application admin scaffold 2015-01-17 22:23:26 -08:00
Dmitriy Zaporozhets ea4b0d75dd Fix commits pagination
Conflicts:
	CHANGELOG
2015-01-17 22:21:57 -08:00
Dmitriy Zaporozhets b9d09a0c5e Add tests to home page url redirect 2015-01-16 19:39:13 -08:00
Dmitriy Zaporozhets 4a49a937cd Allow to specify home page for non logged-in users 2015-01-16 19:39:02 -08:00
Dmitriy Zaporozhets 089df35f02 Merge branch 'remove-password-strength-indicator' into 'master'
Remove password strength indicator

We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.

See merge request !1399
2015-01-15 19:20:43 +00:00
Dmitriy Zaporozhets c6ab8d04e8 Fix tabindex for comment form 2015-01-15 10:34:40 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
2015-01-15 14:10:13 +01:00
Dmitriy Zaporozhets 1e0f36b42a Merge branch 'fix-comments' into 'master'
Fix comments

Fixes:

* drag-n-drop works for diff comments
* selecting images works for diff comments
* preview works for edit comments
* drag-n-drop works for edit comments
* selecting images works for edit comments
* if comment presented on 'Discussion' and 'Changes' tabs - after edit it updates on both tabs.
* Correctly hide form when edit comment on diff
* fix full-screen for diff comments

See merge request !1398
2015-01-15 09:18:10 +00:00
Dmitriy Zaporozhets cad685e70b Refactor zen mode. Make it works in diffs 2015-01-15 00:15:12 -08:00
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Sytse Sijbrandij f8b97b454b Make view link come first so I don't have to mouse to the end of the email line. 2015-01-14 21:12:16 -08:00
Dmitriy Zaporozhets c9bdc03bd9 Improve layout css 2015-01-14 18:42:25 -08:00
Dmitriy Zaporozhets 46ed6fb58f Revert "Fix anchor issue with fixed navbar"
This reverts commit 204b3c121c.
2015-01-14 17:22:36 -08:00
Dmitriy Zaporozhets 204b3c121c Fix anchor issue with fixed navbar
When use anchors - conetent gets hidden under navbar. This commit fixes
with hack using margin+height combination
2015-01-14 15:22:31 -08:00
Dmitriy Zaporozhets 1e37e8924a Improve github import page UI 2015-01-13 11:44:17 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer'
Conflicts:
	app/helpers/projects_helper.rb
2015-01-13 10:35:16 -08:00
Dmitriy Zaporozhets ef933a4a96 Improve import page 2015-01-13 10:34:01 -08:00
yglukhov c13f420b66 First entry in wiki history leads to newest revision. 2015-01-13 12:17:05 +02:00
Marin Jankovski 0a089661fd Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class. 2015-01-12 13:35:29 +01: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 9c03c1c545 Make automerge via satellite 2015-01-09 19:10:01 -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 b55a0519ac Pass source project variable to commits list on MR page 2015-01-06 15:39:33 -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
Wanfung Joshua Lee 3d7519016f fix the wacky dashboard intro icon styling [ci skip] 2015-01-05 20:04:53 -08:00
Dmitriy Zaporozhets d884c21004 Merge branch 'create-merge-request-view' into 'master'
Create merge request view

Updated the create merge request view to use the horizontal form layout, and added tabs for commits and changes.
Also updated commits layout to use the same as the projects commits layout.

Screenshots: [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/892d1bf4c0/Screenshot_from_2014-12-29_20_33_19.png) - [After](https://gitlab.com/uploads/stephanvl/gitlab-ce/508b3100c7/Screenshot_from_2014-12-29_20_34_40.png)

Fixes #923

See merge request !270
2015-01-05 19:19:05 +00:00
Dmitriy Zaporozhets 7e6030e40c Merge branch 'create-issue-view' into 'master'
Create issue view

This changes the create/edit issue view, to only show the create milestone/label links if the user is allowed to create one, and puts the 'Please review the guidelines for contribution to this repository' message above the submit button.

Screenshots [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/ae2ff67f88/Screenshot_from_2014-12-29_20_43_06.png) - [After (allowed)](https://gitlab.com/uploads/stephanvl/gitlab-ce/3a4682d776/Screenshot_from_2014-12-29_20_43_29.png) - [After (not allowed)](https://gitlab.com/uploads/stephanvl/gitlab-ce/86a548d3b3/Screenshot_from_2014-12-29_20_44_00.png)

See merge request !272
2015-01-05 19:17:29 +00:00
Dmitriy Zaporozhets 9b3ab90adb Merge branch 'fix/deleted_file' into 'master'
Fix deleted file representation with new gitlab_git gem

Added this MR as per request from https://github.com/gitlabhq/gitlabhq/pull/7980

* Add new gitlab_gem as per gitlab-org/gitlab_git!6
* Fix the showing of deleted file, as it only displays the named of the file, rather than specifying what had happened

**Before**

![Screen Shot 2014-12-30 at 21.02.55](https://gitlab.com/uploads/arif-ali/gitlab-ce/67ec88b06d/Screen_Shot_2014-12-30_at_21.02.55.png)

**After**

![Screen Shot 2014-12-30 at 21.05.18](https://gitlab.com/uploads/arif-ali/gitlab-ce/050b689c82/Screen_Shot_2014-12-30_at_21.05.18.png)

See merge request !273
2015-01-05 19:15:15 +00:00
Dmitriy Zaporozhets 1ce14dd759 Merge branch 'fix-xmlns-namespacing-atom-feeds' into 'master'
Fix xmlns:media namespacing for atom feeds

A recent commit gitlab-org/gitlab-ce@d31d711a70 introduced a bug that broke four of the atom feeds. The namespace for xmlns:media was not defined properly. This patch fixes the issues for all four feeds.

See merge request !274
2015-01-05 19:13:21 +00:00
Dmitriy Zaporozhets 252e4fd996 Merge pull request #8489 from yglukhov/wiki-md-preview
Markdown preview in wiki
2015-01-03 11:05:42 +02:00
Jeremy Maziarz e5c0e2603a Fix xmlns:media namespacing for atom feeds 2014-12-31 15:05:38 -05:00
marmis85 021cff67f3 Flatten the directory hierarchy while there is only one directory descendant 2014-12-31 03:15:04 +01:00
Arif Ali 1d8dcfaf8b fix deleted file display when using new gitlab_git gem, and add new gitlab_git gem 2014-12-30 21:59:38 +00:00
Stephan van Leeuwen 25c37b0e73 Fixed issue not being able to create a new issue on an empty project. 2014-12-30 18:53:46 +01:00
Dmitriy Zaporozhets 6e217bd55c Improve accept mr widget UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-30 17:28:34 +02:00
Dmitriy Zaporozhets 2010ae11f3 Merge branch 'merge-request-commits-view' into 'master'
Merge request commits view

Changes the commits view of a merge request to use the same layout as used in the project commits view.

As noticed from #923.

This also changes the commits icon on the tab to be fa-history, the same as used in the sidebar

Screenshots [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/8785737424/Screenshot_from_2014-12-29_20_39_25.png) - [After](https://gitlab.com/uploads/stephanvl/gitlab-ce/a3bf2a790f/Screenshot_from_2014-12-29_20_40_23.png)

See merge request !271
2014-12-30 13:40:13 +00: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
Marin Jankovski 82829ed49e Move user key manipulation in admin section to a separate controller. 2014-12-30 10:15:11 +01:00
Dmitriy Zaporozhets da9d827904 Merge branch 'inline-protected-branches' into 'master'
Improve UI for protected branches

See merge request !1361
2014-12-29 21:08:21 +00:00
Stephan van Leeuwen b753bfd145 Updated issuable form to only show create links if allowed, and added contribution guide url to form actions.
Also changed icon for labels.
Removed contribution guide notice from issue form.
2014-12-29 20:29:59 +01:00
Stephan van Leeuwen 4fe699fdc3 Updated create merge request submit view
Create merge request submit view now uses the same form layout as creating an issue.
The commits view now uses the same layout as the project commits view
The commits and diffs are now in separate tabs, as used in the merge request view
2014-12-29 20:14:51 +01:00
Dmitriy Zaporozhets 159ba9b958 Merge pull request #8496 from NARKOZ/644
chmod -x
2014-12-29 21:04:58 +02:00