summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add note about semantic versioning not being absolute.relative-sematic-versioningSytse Sijbrandij2015-01-101-1/+1
|
* Merge branch 'flatten-dirs' into 'master'Dmitriy Zaporozhets2015-01-113-1/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * point to a specific branch in the test repo to avoid conflictsmarmis852015-01-112-2/+2
| |
| * updated master to latests shamarmis852015-01-111-1/+1
| |
| * Add test spec for TreeHelper modulemarmis852015-01-101-0/+28
| |
| * Flatten the directory hierarchy while there is only one directory descendantmarmis852014-12-312-1/+12
| |
* | Merge branch 'release-doc' into 'master'Dmitriy Zaporozhets2015-01-111-18/+19
|\ \ | | | | | | | | | | | | | | | Release doc See merge request !1381
| * | Small spelling improvements.Sytse Sijbrandij2015-01-101-18/+19
| | |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-102-210/+207
|\ \ \ | |/ /
| * | Merge branch 'refactor-release-doc' into 'master'Sytse Sijbrandij2015-01-112-210/+207
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor release doc * Follow issue as todo list instead of document * move huge rc1 block to separate file * cleanup and fix order of some actions See merge request !1379
| | * | Make ordered lists for release docDmitriy Zaporozhets2015-01-111-19/+19
| | | |
| | * | Replace befor with beforeDmitriy Zaporozhets2015-01-111-7/+7
| | | |
| | * | Improve monthly.md with fixes proposed from SytseDmitriy Zaporozhets2015-01-101-21/+27
| | | |
| | * | Improve monthly.md with fixes proposed from SytseDmitriy Zaporozhets2015-01-101-27/+21
| | | |
| | * | Improve monthly.md with fixes proposed from @sytseDmitriy Zaporozhets2015-01-101-21/+27
| | | |
| | * | Cleanup and refactor release doc. Follow issue as a todo listDmitriy Zaporozhets2015-01-092-199/+190
| | | |
* | | | If noteable is nil - make discussion outdatedDmitriy Zaporozhets2015-01-101-0/+1
|/ / /
* | | Merge branch 'easy-dev-install' into 'master'Dmitriy Zaporozhets2015-01-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Easy dev install @jeroenvanbaarsen just tried the following: 1. Removing therubyracer from gemfile 2. Install node (brew install node or sudo apt-get install nodejs) 3. Run $ spinach features/ All worked as before, so this would mean people have to install the node dependency on their local machine, but in my experience this is much easier than installing libv8, especially for non ruby-devs. /cc @jacobvosmaer See merge request !262
| * | | Require the ruby racer only in production since installing it on dev ↵easy-dev-installSytse Sijbrandij2014-12-151-1/+1
| | | | | | | | | | | | | | | | machines can cause a lot of problems. Hat tip to Jeroen van Baarsen
* | | | Merge branch 'async-satellites' into 'master'Dmitriy Zaporozhets2015-01-105-6/+32
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Async satellites Do merge request automerge via satellite. See merge request !1380
| * | | Make automerge via satelliteDmitriy Zaporozhets2015-01-095-6/+32
|/ / /
* | | Rescue missing database errorsJacob Vosmaer2015-01-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | While loading the Rails app we cannot assume that the gitlabhq_xxx database exists already. If we do, `rake gitlab:setup` breaks! This is a quick hack to make sure that fresh development setups of GitLab (from master) will work again.
* | | Merge branch 'popen_close_stdin'Dmitriy Zaporozhets2015-01-082-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: CHANGELOG
| * | | Close standard input in Gitlab::Popen.popenJacob Vosmaer2015-01-052-0/+4
| | | |
* | | | Update CHANGELOGDmitriy Zaporozhets2015-01-081-0/+17
| | | |
* | | | Merge branch 'app-settings' into 'master'Dmitriy Zaporozhets2015-01-0829-32/+230
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Dynamic application settings in database See merge request !1378
| * | | | Finally fix stuff related to dynamic configDmitriy Zaporozhets2015-01-085-8/+12
| | | | |
| * | | | Fix feature and testsDmitriy Zaporozhets2015-01-084-7/+5
| | | | |
| * | | | Create ApplicationSettings if does not exist in runtimeDmitriy Zaporozhets2015-01-084-20/+24
| | | | |
| * | | | Hack for migrating to new settingsDmitriy Zaporozhets2015-01-082-3/+12
| | | | |
| * | | | Improve application settings and write testsDmitriy Zaporozhets2015-01-0820-77/+123
| | | | |
| * | | | Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-0815-7/+144
|/ / / /
* | | | Redesign signin/singup pagesDmitriy Zaporozhets2015-01-0710-107/+148
| | | |
* | | | GitLab does not work well with Ruby 2.2 yetDmitriy Zaporozhets2015-01-071-1/+1
| | | |
* | | | Merge branch 'update_api_messages' into 'master'Dmitriy Zaporozhets2015-01-0716-25/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update api messages See merge request !1364
| * \ \ \ Merge branch 'master' into update_api_messagesMarin Jankovski2015-01-0752-392/+528
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: CHANGELOG
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-01-061-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #8503 from cirosantilli/unused-ex-varDmitriy Zaporozhets2015-01-061-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove unused ex local variable from event.rb
| | * | | | | Remove unused ex local variable from event.rbCiro Santilli2014-12-291-1/+1
| | | | | | |
* | | | | | | Merge branch 'merge-system-note' into 'master'Dmitriy Zaporozhets2015-01-076-24/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor merge request merge service See merge request !1374
| * | | | | | | Improve mr refresh service testsDmitriy Zaporozhets2015-01-061-4/+4
| | | | | | | |
| * | | | | | | Ooops! Removing debug line :)Dmitriy Zaporozhets2015-01-061-1/+0
| | | | | | | |
| * | | | | | | Refactor merge request merge serviceDmitriy Zaporozhets2015-01-065-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add system note when user merges MR in same way as it closes it * Remove duplicating code
* | | | | | | | Merge branch 'fix-commits-link-mr' into 'master'Dmitriy Zaporozhets2015-01-074-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | | | | | | | | Fix commit link on MR from fork See merge request !1372
| * | | | | | Pass source project variable to commits list on MR pageDmitriy Zaporozhets2015-01-064-4/+4
|/ / / / / /
* | | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-01-0610-199/+209
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI improvements Improve filtering UI for next pages: * dashboard projects page * group milestones page * project milestones page See merge request !1370
| * | | | | | Restyle and refactor dashboard projects page filteringDmitriy Zaporozhets2015-01-063-114/+139
| | | | | | |
| * | | | | | Restyle and refactor milestones filterDmitriy Zaporozhets2015-01-067-85/+70
|/ / / / / /
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-01-064-8/+23
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'event-last-push-styling-fix' into 'master'Dmitriy Zaporozhets2015-01-061-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event-last-push styling fix When viewing a fresh install of GitLab on a mobile device after a branch with a name of sufficient length, the broken styling can be seen as follows: ![Screen Shot 2015-01-05 at 9.37.32 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/9b3ca84f1a/Screen_Shot_2015-01-05_at_9.37.32_PM.png) I modified the css for .event-last-push and .event-last-push-text to make it look correct: ![Screen Shot 2015-01-05 at 9.37.50 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/43d5a912b3/Screen_Shot_2015-01-05_at_9.37.50_PM.png) As this is a purely css change, I don't believe it will break any tests. The only occurrence of .event-last-push* is in ./app/views/events/_event_last_push.html.haml See merge request !279
View Lorry Controller Status