home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
eb84ee7a20cb84d3657e1b341e792053eba94455
Commit Graph
13452 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets eb84ee7a20 Better label for diffs 2015-01-15 15:19:58 -08:00
Dmitriy Zaporozhets 41f09bed82 Re-order admin dashboard 2015-01-15 15:19:04 -08:00
Dmitriy Zaporozhets e683d05453 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-15 14:57:55 -08:00
Dmitriy Zaporozhets 3d3c7efa3e Increase font size for lists 2015-01-15 14:55:45 -08:00
Dmitriy Zaporozhets 500dab098b Merge pull request #8568 from Sheigutn/master 
Add support for colored header on Android Lollipop with Chrome
 2015-01-15 14:42:58 -08:00
Dmitriy Zaporozhets d4a8471fe9 Merge pull request #7987 from cirosantilli/get-instead-match 
Replace match via get with get on routes
 2015-01-15 14:42:24 -08:00
Dmitriy Zaporozhets 11591573e1 Merge pull request #7925 from cirosantilli/unused-arguments 
Remove or prepend underscore _ to unused method arguments
 2015-01-15 14:42:03 -08:00
Dmitriy Zaporozhets dbd54fad51 Merge pull request #7905 from cirosantilli/visible-false 
Change always passing visible false tests.
 2015-01-15 14:41:41 -08:00
Dmitriy Zaporozhets 6f78be4d62 Merge pull request #7951 from cirosantilli/uniform-blob-edit 
Make blob new and edit file editors more uniform
 2015-01-15 14:38:07 -08:00
Dmitriy Zaporozhets c5ba87a2fb Merge pull request #8096 from cirosantilli/regex-to-string 
Replace regex methods by string ones since faster and more readable
 2015-01-15 14:37:11 -08:00
Dmitriy Zaporozhets 9c4015f3e8 Merge pull request #8430 from cirosantilli/simplify-ssh-fingerprint-regex 
Simplify SSH fingerprint regexp extraction
 2015-01-15 14:33:24 -08:00
Dmitriy Zaporozhets 84e6fe361d Welcome to 7.8 :) 2015-01-15 14:31:40 -08:00
Dmitriy Zaporozhets 892be53fa3 Merge pull request #8425 from rumpelsepp/rouge 
Replace highlight.js with rouge-fork rugments
 2015-01-15 14:28:24 -08:00
Dmitriy Zaporozhets 23255bff99 Merge branch 'send_checkout_sha_to_services' into 'master' 
Send checkout sha to services

In case of tags it may be useful to have sha of commit this tag points to.
So now web hooks and services get additional parameter `checkout_sha`

See merge request !1400
 2015-01-15 20:01:31 +00: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 5254de907d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-15 11:18:26 -08:00
Dmitriy Zaporozhets 4cd1b6d98e Merge branch 'fix-tab-index' into 'master' 
Fix tab index

Fixes #1892

See merge request !1401
 2015-01-15 19:18:04 +00:00
Dmitriy Zaporozhets de27375d6c Test git builder over annotated tag 2015-01-15 11:17:47 -08:00
Dmitriy Zaporozhets c6ab8d04e8 Fix tabindex for comment form 2015-01-15 10:34:40 -08:00
Sytse Sijbrandij e310199a53 Merge pull request #8576 from kfei/docker/update-omnibus-package 
Update the Omnibus package in Dockerfile
 2015-01-15 10:26:41 -08:00
Dmitriy Zaporozhets a0d4235c04 Send checkout sha for web hooks and services 2015-01-15 10:26:33 -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
Stefan Tatschner 089516209c Fixed tests 2015-01-15 14:01:12 +01:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments 
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
 2015-01-15 13:41:11 +01:00
Stefan Tatschner 377ae46005 Updated gollum-libs 
I did this commit in an earlier revision of my pull request. As
reverting this commit later caused failing tests I decided to
include it again.
 2015-01-15 13:13:54 +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 b124d9e0bb Comment broken test because I dont have time to improve it 2015-01-15 01:17:07 -08:00
Dmitriy Zaporozhets 10f45cf33a Fix specs 2015-01-15 00:37:33 -08:00
Dmitriy Zaporozhets cad685e70b Refactor zen mode. Make it works in diffs 2015-01-15 00:15:12 -08:00
Dmitriy Zaporozhets 3333bd4608 Explicitly enable drag-n-drop for issue/mr/wiki markdown forms 2015-01-14 23:18:21 -08:00
Dmitriy Zaporozhets 23498337b1 Clone comment form on edit. Fixes bug with disappearing textarea or cancel of edit 2015-01-14 23:09:30 -08:00
Dmitriy Zaporozhets 28dc04aac2 Merge branch 'view-link-first' into 'master' 
View link first

See merge request !1397
 2015-01-15 06:43:51 +00:00
Dmitriy Zaporozhets 47f0a8dbdd Merge branch 'fix-scroll-issue' into 'master' 
Fix scroll issue

Fixes #1886

See merge request !1396
 2015-01-15 06:43:25 +00:00
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Dmitriy Zaporozhets 80e784edb8 Fix image drag-n-drop to diff comments 2015-01-14 21:43:31 -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 8bc65f6d4b Fix anchors being hidden under fixed navbar issue 2015-01-14 19:39:10 -08:00
kfei 210a13ad42 Update the Omnibus package in Dockerfile 
From 7.5.3 to 7.6.2.

Signed-off-by: kfei <kfei@kfei.net>
 2015-01-15 11:34:49 +08:00
Dmitriy Zaporozhets 2c053c93b2 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-14 18:42:52 -08:00
Dmitriy Zaporozhets c9bdc03bd9 Improve layout css 2015-01-14 18:42:25 -08:00
Dmitriy Zaporozhets 41353b6362 Fix code block in rc1 doc 2015-01-15 02:07:42 +00:00
Dmitriy Zaporozhets 8e36070cce Remove bold text 2015-01-14 17:44:59 -08:00
Dmitriy Zaporozhets 973449b567 Update guides for CE 2015-01-14 17:40:35 -08:00
Dmitriy Zaporozhets a7dddd1bca Create update doc for 7.7 2015-01-14 17:34:39 -08:00
Dmitriy Zaporozhets 36acf5b293 Revert "Fix tests" 
This reverts commit 1e45ba7f16.
 2015-01-14 17:22:48 -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 18b7acc399 Merge branch 'fix-anchor-bug' into 'master' 
Fix anchor bug

Fixes #1886

See merge request !1395
 2015-01-15 00:42:55 +00:00
Dmitriy Zaporozhets 1e45ba7f16 Fix tests 2015-01-14 16:23:20 -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 ff7f4a134e Revert "Scroll the readme anchors below the navbar." 
This reverts commit b1792d9e4c.
 2015-01-14 09:57:38 -08:00