home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Ciro Santilli d584c406e8 Move new blob commit message textarea below editor 
- match edit blob view
- you enter the commit message *after* you make the modifications
 2014-10-13 20:54:33 +02:00
Dmitriy Zaporozhets e261de255d Merge pull request #7942 from cirosantilli/commit-changes-uppercase 
Make new and edit file submit more uniform
 2014-10-13 18:47:46 +03:00
Jan-Willem van der Meer 6c0994a3b3 Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers 
Conflicts:
	app/controllers/omniauth_callbacks_controller.rb
 2014-10-13 17:07:53 +02:00
Dmitriy Zaporozhets 05fca6bfc2 Merge branch 'sorting-users-in-admin' into 'master' 
Sorting users in admin

See merge request !1170
 2014-10-13 13:59:17 +00:00
Valery Sizov 4e0da2325b Admin: user sorting 2014-10-13 16:07:57 +03:00
Dmitriy Zaporozhets 9229893c8a Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
 2014-10-13 11:46:45 +00: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
Dmitriy Zaporozhets 4731d77bb2 Merge pull request #8020 from mr-vinn/note-trunc-link 
Improve event note display in dashboard and project activity views
 2014-10-13 11:40:50 +03: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
Dmitriy Zaporozhets b956605f9e Merge branch 'ambiguous-sha' into 'master' 
Fix ambiguous sha problem with mentioned commit

Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception.

- [x] write full commit sha in db.
- [x] Standardise usage of sha truncation: 8 characters everywhere.
- [x] prevent exception when ambiguous sha requested in markdown

Fixes #1644

See merge request !1171
 2014-10-12 20:28:21 +00: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
Sytse Sijbrandij c9c6f77ec1 Merge pull request #7915 from bbodenmiller/patch-12 
improve wording on protected branches page
 2014-10-12 14:54:36 +02:00
Ben Bodenmiller ab64ca7a11 improve wording on protected branches page 2014-10-12 05:23:12 -07:00
Vinnie Okada 6798a6a8e2 Allow HTML tags in user Markdown input 
Allow whitelisted tags to appear in rendered HTML output by disabling
Redcarpet's `:filter_html` option.
 2014-10-10 14:42:24 -05:00
Dmitriy Zaporozhets 8c01448cf9 Dontr decoarate already decorated stuff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 17:39:29 +03:00
Dmitriy Zaporozhets ea04ed7879 Use 8chars short sha for commit in views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:30:14 +03:00
Dmitriy Zaporozhets daa55f31d8 Dont raise exception when wrong commit id passed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:58:11 +03:00
Dmitriy Zaporozhets 200118357d Use full commit sha width for reference in note body to prevent Ambiguous SHA1 prefix problem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:44:27 +03: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
Jan-Willem van der Meer d059f50d4c Refactor OAuth refactorings to CE 2014-10-10 12:03:32 +02:00
Vinnie Okada 85f1e8b84a Remove unused method 2014-10-09 22:33:29 -05:00
Valery Sizov 82c938ad75 annotate 2014-10-09 18:22:20 +03:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Dmitriy Zaporozhets d9aa3f9215 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-08 20:33:42 +03:00
Dmitriy Zaporozhets 629bd2831f Remove border radius because it has wrong background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 20:33:28 +03:00
Dmitriy Zaporozhets a1e2fb8458 Merge pull request #7986 from liammonahan/master 
Correctly pluralize participants on issue show page
 2014-10-08 20:15:02 +03:00
Dmitriy Zaporozhets 21e9ed2eaf Merge branch 'improve-danger-zone' into 'master' 
Improve danger zone

* show transfer/remove boxes by default
* ask person to type project name before transfer/remove

Fixes #1347

See merge request !1161
 2014-10-08 13:58:31 +00:00
Liam Monahan 48bc9e3623 Correctly pluralize participants on issue show page. 2014-10-08 09:00:47 -04:00
Dmitriy Zaporozhets ab68fd2206 Restyle colorful panel boxes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 15:47:24 +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 9021debf50 ConfirmDangerModal window added. It will be used for confirmation of dangerous actions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 13:56:57 +03:00
Dmitriy Zaporozhets b694bf6f64 Merge pull request #7545 from buildbox/buildbox-service 
Buildbox Service Integration
 2014-10-08 12:34:22 +03:00
Keith Pitt f013973d19 Handle the case where the CI service may not provide a status_img_path method. 2014-10-08 17:22:41 +08:00
Dmitriy Zaporozhets e8a826030e show danger settings by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 11:54:51 +03:00
Dmitriy Zaporozhets d30e1f5cb8 Merge pull request #7983 from cirosantilli/factor-issue-mr-service 
Factor issue and merge request services
 2014-10-08 11:39:19 +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
Dmitriy Zaporozhets cf1aa36a21 Merge pull request #7979 from mr-vinn/refactor-tasks 
Refactor task list tests and coffeescript
 2014-10-08 11:37:21 +03:00
Keith Pitt 4c7da578f2 Merge branch 'master' into buildbox-service 
Conflicts:
	app/models/project.rb
 2014-10-08 16:33:53 +08:00
Keith Pitt 76594d474c Added support for Buildbox 2014-10-08 16:30:04 +08:00
Ciro Santilli 166c215a75 Make new and edit file submit more uniform 2014-10-08 10:01:07 +02: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
Robert Schilling 9e0a7ecb43 Merge pull request #7991 from cirosantilli/app-finders-readme 
Improve formatting of app/finders/README.md [failure unrelated]
 2014-10-08 00:30:22 +02:00
Ciro Santilli 7984065776 Improve formatting of app/finders/README.md 2014-10-07 22:39:45 +02:00
Ciro Santilli 23b4a2e721 Factor issue and merge request services 2014-10-07 21:12:18 +02:00
Robert Schilling e95a8e1500 Merge pull request #7985 from cirosantilli/outdated-comment 
Remove outdated comment from commits_controller
 2014-10-07 19:02:52 +02:00
Ciro Santilli ceaebe233c Remove outdated comment from commits_controller 2014-10-07 18:52:16 +02:00
Vinnie Okada 9dcb643fd4 Rename coffeescript file 2014-10-07 11:17:04 -05:00
Dmitriy Zaporozhets 51ed8b7edd Merge branch 'mr-widget-css' into 'master' 
Style merge request CI widget to match MR/Issue box

![Screenshot 2014-10-07 15.13.12](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/7208a92094/Screenshot_2014-10-07_15.13.12.png)

![Screenshot 2014-10-07 15.13.25](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/f04d8d3f7b/Screenshot_2014-10-07_15.13.25.png)

See merge request !1158
 2014-10-07 14:26:08 +00: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