home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher cb079c8208 Fix Markdown feature spec 2015-05-06 20:43:12 -04:00
Robert Speicher 0cc7536341 Fix header link anchors 2015-05-06 18:38:43 -04:00
Robert Speicher 1108915f75 Change wording for task list summaries 2015-05-06 17:27:10 -04:00
Robert Speicher fdff815a4c Add Markdown feature specs for markup inside links 
It was already working, just want to make sure we don't break it in the
future.
 2015-05-06 17:21:19 -04:00
Robert Speicher 0a99e6e2fa Remove 'jasmine' gem 
jasmine-rails still requires it as a dependency, but for some reason
running `rake jasmine:ci` produced test failures but
`rake spec:javascript` didn't.
 2015-05-06 15:31:24 -04:00
Robert Speicher d5ee54df16 More JS dependency requirements 2015-05-06 15:31:08 -04:00
Robert Speicher 33836ae02c Remove unneeded jasmine setup 2015-05-06 15:29:46 -04:00
Robert Speicher b519e2312f Disable Rack::MiniProfiler for Jasmine's specs route 2015-05-06 15:13:17 -04:00
Robert Speicher 51c3393974 Task List feature and JS specs 2015-05-06 13:16:37 -04:00
Robert Speicher c96c7cbfb1 Make issue JS require its dependencies 2015-05-06 13:00:14 -04:00
Robert Speicher 968c281f40 Make notes JS require its dependencies 2015-05-06 13:00:14 -04:00
Robert Speicher a10d8100b7 Update jasmine-fixture 2015-05-06 13:00:14 -04:00
Robert Speicher f3d63eeb18 Remove feature tests for old task lists 2015-05-06 13:00:14 -04:00
Robert Speicher c915c7b001 Add TaskList to Markdown feature spec 2015-05-06 13:00:13 -04:00
Robert Speicher 421f3f1551 Change padding for task lists in notes 2015-05-06 13:00:13 -04:00
Robert Speicher 725ff58bc8 Don't add js-task-list-container to things the user can't edit 2015-05-06 13:00:13 -04:00
Robert Speicher 5c7b91e29b Single quotes/icon helper in views 2015-05-06 13:00:11 -04:00
Robert Speicher 6883e6e084 Remove all references to parse_tasks 2015-05-06 12:58:28 -04:00
Robert Speicher e167f28549 Update Taskable to use TaskList 2015-05-06 12:58:28 -04:00
Robert Speicher ce29e5cd8f Update task list behavior for Merge Requests 2015-05-06 12:58:27 -04:00
Robert Speicher 922497560e Update task list behavior for Notes 2015-05-06 12:58:27 -04:00
Robert Speicher a3d55db910 Update task list behavior for Issues 2015-05-06 12:58:27 -04:00
Robert Speicher 18baf550e1 Add task_list JS 2015-05-06 12:58:27 -04:00
Robert Speicher 61c73575c3 Add TaskList::Filter to pipeline 2015-05-06 12:58:27 -04:00
Robert Speicher 5ef8bd33d0 Remove taskable.js 2015-05-06 12:58:27 -04:00
Robert Speicher bc14d223a7 Add task_list gem 2015-05-06 12:58:26 -04:00
Robert Speicher 5ed7a39dc7 Fix tooltips for event filter links 2015-05-06 12:25:23 -04:00
Dmitriy Zaporozhets 5b3c823fc9 Make header title bold and line between header lighter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 18:27:44 +03:00
Dmitriy Zaporozhets 48a398328f Replace outdated gif in README with link to website 2015-05-06 15:11:55 +00:00
Dmitriy Zaporozhets f78dfa6da7 Merge branch 'refactor-mr-form' into 'master' 
Refactor mr form

* re-use issuable form for new mr page
* small UI improvements to MR compare and new pages

See merge request !616
 2015-05-06 14:50:33 +00:00
Dmitriy Zaporozhets ea6667b06c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-06 17:49:05 +03:00
Sytse Sijbrandij dd37aa06ca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-06 16:48:05 +02:00
Dmitriy Zaporozhets 065637a80e Merge branch 'ui-improvements' into 'master' 
Small UI improvements to make project sidebar more neat

* make sidebar blocks more compact
* make clone panel smaller for better aspect ratio
* make `forked from` section cleaner

Screenshot:

![Screenshot_2015-05-06_16.42.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/69723db619ae7ae4d9551f6340d45384/Screenshot_2015-05-06_16.42.12.png)

cc @rspeicher

See merge request !617
 2015-05-06 14:47:42 +00:00
Sytse Sijbrandij 48f22a39e7 Merge branch 'single-docker-image' into 'master' 
Single docker image

See merge request !1805
 2015-05-06 14:40:02 +00:00
Sytse Sijbrandij 6518c728ac Small improvements to the dockerfile. 2015-05-06 16:39:30 +02:00
Dmitriy Zaporozhets 317ed1fa90 Revert "Allow to configure smtp and sendmail in gitlab.yml" 2015-05-06 17:39:18 +03:00
Dmitriy Zaporozhets c66e575179 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 17:00:19 +03:00
Dmitriy Zaporozhets fb00ed9983 Make README link on project home look nicer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:52:04 +03:00
Dmitriy Zaporozhets 342078a76d Small UI improvements to make project sidebar more neat 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:38:45 +03:00
Sytse Sijbrandij e8edd20bfd Made a single docker file. 2015-05-06 15:32:29 +02:00
Dmitriy Zaporozhets d49b993929 Small UI improvements to MR form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:19:09 +03:00
Dmitriy Zaporozhets cd108a828b Re-use issuable_form for new merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:11:47 +03:00
Dmitriy Zaporozhets 86ec49add4 Merge pull request #8800 from jirutka/email-settings 
Allow to configure smtp and sendmail in gitlab.yml
 2015-05-06 15:59:21 +03:00
Dmitriy Zaporozhets 3f2282300d Merge branch 'mr-change-branches' into 'master' 
When use change branches link at MR form - save source branch selection instead of target one

Fix for https://dev.gitlab.org/gitlab/gitlabhq/issues/1800

cc @jacobvosmaer

See merge request !615
 2015-05-06 12:46:42 +00:00
Dmitriy Zaporozhets 22d5e9855c When use change branches link at MR form - save source branch selection instead of target one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 15:13:11 +03:00
Jakub Jirutka b4be7aed77 Allow to configure smtp and sendmail in gitlab.yml 2015-05-06 13:15:33 +02:00
Robert Schilling 7af59c54fc Merge pull request #9248 from rumpelsepp/fix-modal 
Fix a trailing new line
 2015-05-06 12:43:03 +02:00
Stefan Tatschner dc68179b59 Fix a trailing new line 
The "How to Merge" modal included a trailing new line in the code
block. This commit removes that disfigurement.
 2015-05-06 11:10:48 +02:00
Jeroen van Baarsen 2856d5f9fc Merge pull request #9241 from Soullivaneuh/button-type 
Fix missing button types
 2015-05-06 10:19:17 +02:00
Dmitriy Zaporozhets b4150137e9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-06 11:16:01 +03:00