home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,295 Commits 48 Branches 340 Tags
593a287c8d0cfcc22ca2db35dc9a72140e296c2e
Commit Graph
1201 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c926922ade Show merge in progress message if MR is locked 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-15 15:52:39 +03:00
Dmitriy Zaporozhets 381a6283a9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-15 15:35:08 +03:00
Dmitriy Zaporozhets 67a28cea30 Merge pull request #8048 from skv-headless/master 
same rendering for note diff as for usual diff
 2014-10-15 15:15:40 +03:00
Marin Jankovski 76cde5c0e5 Add links to the migration doc, make it clear import is only for git repos. 2014-10-15 13:13:42 +02:00
Evgeniy Sokovikov 732e6c3dbb same rendering for note diff as for usual diff 2014-10-15 13:03:27 +04:00
Dmitriy Zaporozhets 0d30b13a7a Move "modify merge message link" to the right to prevent accidently hiting accept button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-14 17:48:32 +03: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
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
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
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 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
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
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
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
Dmitriy Zaporozhets 593a1b3b3e Style merge request CI widget to match MR/Issue box 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 15:11:18 +03:00
Marin Jankovski 0fed1b5876 Merge pull request #7964 from mr-vinn/task-lists 
Add task lists to issues and merge requests
 2014-10-06 17:29:06 +02:00
Dmitriy Zaporozhets 299114948b Use only escaped auto_link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 15:15:39 +03:00
Vinnie Okada 9f0083a96c Add task lists to issues and merge requests 
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input.  Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks.  Task status is also displayed in the MR and issue
lists.
 2014-10-05 22:15:27 -05:00
Sullivan SENECHAL c0e2eee38b Fix fa-download icon 2014-10-04 16:58:59 +02:00
Sullivan SENECHAL d1fa3b336d Add Pushover service integration 
That introduce select field type for services options.
 2014-10-03 13:54:37 +02:00
Dmitriy Zaporozhets 43217dd5dd Merge branch 'cirosantilli-factor-commit-msg-textarea' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
 2014-10-03 14:38:33 +03:00
Dmitriy Zaporozhets 5709e8d76c Merge branch 'new-milestone-link' into 'master' 
New milestone and label links

Fixes #1364

Fixes #1586

See merge request !1145
 2014-10-03 11:11:58 +00:00
Dmitriy Zaporozhets 4ebe718d69 Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/blob/_remove.html.haml
 2014-10-03 13:34:25 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Marin Jankovski 910d5cf332 Merge pull request #7748 from yglukhov/clickable-source-repo-in-mr 
Source repo is now clickable.
 2014-10-03 10:21:59 +02:00
Robert Schilling 06fd4bf7e1 Merge pull request #7922 from cirosantilli/improve-remove-file-commit-placeholder 
Improve remove file oommit message textarea placeholder.
 2014-10-03 00:00:33 +02:00
Marin Jankovski cc2d7771db Merge branch 'feature/zen_for_gfm' of github.com:Razer6/gitlabhq into Razer6-feature/zen_for_gfm 
Conflicts:
	CHANGELOG
 2014-10-02 15:41:05 +02:00
Ciro Santilli 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Dmitriy Zaporozhets d3388d4790 New label link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 12:55:02 +03:00
Dmitriy Zaporozhets d2808476e3 Add new milestone link. Hide empty milestone selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 12:52:19 +03:00
Dmitriy Zaporozhets c6f3f9bb33 Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/merge_requests/_form.html.haml
 2014-10-02 12:50:29 +03:00
Robert Schilling e2073f286e Merge pull request #7921 from cirosantilli/improve-new-file-commit-placeholder 
Improve new file commit message textarea placeholder.
 2014-10-02 10:33:09 +02:00
Robert Schilling 4b6bbf92ab Merge pull request #7881 from cirosantilli/rm-blame-extra-white 
Remove blame lines added leading whitespace.
 2014-10-02 10:29:03 +02:00
Robert Schilling 093c2c6a01 Apply ZEN mode to all GFM forms 2014-10-02 09:59:01 +02:00
Marin Jankovski 51bc636eb3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-02 08:46:56 +02:00
Marin Jankovski 2c2c192641 Merge branch 'fix_selecting_them_upload' of gitlab.com:gitlab-org/gitlab-ce 2014-10-02 08:41:48 +02:00
Sytse Sijbrandij ec7339e6f8 Merge pull request #7920 from cirosantilli/simplify-commit-note 
Simplify custom MR good commit message hint.
 2014-10-02 08:40:02 +02:00
Robert Schilling 350877d050 Merge pull request #7904 from cirosantilli/titleize-actions 
Titleize blob action buttons. [failure unrelated]
 2014-10-01 17:58:28 +02:00
Robert Schilling dae670bd69 Search for 'div-dropzone' correctly 2014-10-01 17:30:40 +02:00
Ciro Santilli b7160cb752 Remove blame lines added leading whitespace. 2014-10-01 09:04:10 +02:00
Dmitriy Zaporozhets 88d3e97e50 Merge branch 'readme_tab' into 'master' 
Add Readme tab to project show page

Fixes #1533

See merge request !1140
 2014-10-01 06:32:40 +00:00
Ciro Santilli 0d4ae0e392 Titleize blob action buttons. 2014-09-30 23:32:03 +02:00