Commit Graph
13385 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets be9f5589ed Merge branch 'oauth_api_doc' into 'master'
OAuth2 API documentation

https://dev.gitlab.org/gitlab/gitlabhq/issues/1713

See merge request !1388
2015-01-13 19:56:43 +00:00
Dmitriy Zaporozhets 1e37e8924a Improve github import page UI 2015-01-13 11:44:17 -08:00
Dmitriy Zaporozhets 4d03a2803e Update changelog 2015-01-13 10:47:20 -08:00
Dmitriy Zaporozhets 1358152848 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-13 10:45:49 -08:00
Dmitriy Zaporozhets a16d894b21 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-13 10:45:33 -08:00
Dmitriy Zaporozhets 72c3d728c4 Update db schema 2015-01-13 10:45:14 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer'
Conflicts:
	app/helpers/projects_helper.rb
2015-01-13 10:35:16 -08:00
Dmitriy Zaporozhets ef933a4a96 Improve import page 2015-01-13 10:34:01 -08:00
Sytse Sijbrandij e351b26f84 Merge branch 'prose-requirement' into 'master'
Prose requirement

Feel free to improve or link to authoritative source.

See merge request !285
2015-01-13 18:27:35 +00:00
Sytse Sijbrandij f26c0fa556 Link to guidelines for interface text. 2015-01-13 10:26:55 -08:00
Sytse Sijbrandij 6cce2be7eb Get rid of here links and simplify text. 2015-01-13 10:20:04 -08:00
Sytse Sijbrandij 34b54ee815 Merge branch 'improve_readme_to_website' into 'master'
Improve readme to website

addresses some of https://dev.gitlab.org/gitlab/organization/issues/100.

See merge request !1355
2015-01-13 18:12:45 +00:00
Dmitriy Zaporozhets 9ce7492e58 Merge pull request #8540 from yglukhov/wiki-history
First entry in wiki history leads to newest revision.
2015-01-13 10:02:25 -08:00
Dmitriy Zaporozhets 1f01fcdc0c Merge branch 'scroll_below_the_navbar' into 'master'
Scroll below the navbar

Fixes #1866

Show the markdown anchors by scrolling below the fixed top navbar.

See merge request !1390
2015-01-13 16:38:59 +00:00
Marc Radulescu 1cdce0f182 revise wording to clarify CE and EE definitions 2015-01-13 15:47:35 +01:00
Marin Jankovski 5140bd8824 When anchor is clicked set the correct condition. 2015-01-13 13:14:32 +01:00
Marin Jankovski b1792d9e4c Scroll the readme anchors below the navbar. 2015-01-13 13:01:50 +01:00
yglukhov c13f420b66 First entry in wiki history leads to newest revision. 2015-01-13 12:17:05 +02:00
Jacob Vosmaer 90e4b400ba Merge branch 'git-http-blacklist' into 'master'
Git HTTP blacklist

See merge request !1328
2015-01-13 10:02:49 +00:00
Sytse Sijbrandij 4659a28115 Merge branch 'changelog_guidelines' into 'master'
Add Changelog Guidelines to monthly.md

Fixes #1868

Added the changelog guidelines according to the issue mentioned above. @sytse I didn't add the extra lines to the 7.7.0 log, since we have a codefreeze soon.

/cc @job

See merge request !1389
2015-01-13 03:30:03 +00:00
Valery Sizov f07b165ab7 OAuth API documentation update 2015-01-12 19:29:06 -08:00
Patricio Cano e588328674 Fixed wording in message. 2015-01-12 22:26:51 -05:00
Patricio Cano 0be1a45b9f Updated monthly.md add instructions about the handling of the CHANGELOG
Added DISCLAIMER to CHANGELOG
2015-01-12 22:19:22 -05:00
Dmitriy Zaporozhets 3103e567bc Merge branch 'fix_constant' into 'master'
ForbiddenAction constant name fix

See merge request !1387
2015-01-12 21:19:04 +00:00
Dmitriy Zaporozhets 6774a701a6 Merge branch 'refactor_push_data_builder' into 'master'
Refactor push data builder

See merge request !1384
2015-01-12 21:06:35 +00:00
Valery Sizov 058f223b01 ForbiddenAction constant fix 2015-01-12 09:30:52 -08:00
Dmitriy Zaporozhets bba8e59a04 Fix test hook and tests 2015-01-12 09:08:25 -08:00
Dmitriy Zaporozhets 1c6a125389 Merge branch 'mr_widget_remove_source_branch_checkbox' into 'master'
Mr widget remove source branch checkbox

Fixes #1858

Renamed custom `checkbox` css class for remove source branch checkbox because it was being overwritten on Safari by `checkbox` from bootstrap in `_forms.scss`

After rename, alignment looks corrected

See merge request !1386
2015-01-12 16:58:32 +00:00
Dmitriy Zaporozhets 6643d38f97 Merge branch 'add_search_option_to_project_api' into 'master'
Add search option to project api

When using Ajax to search for users authorised projects we need to do a search query on the returned list rather than doing a request using `/search/:query` option.

This MR also adds a simple spec for project ordering feature that got added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/266 but no specs were provided.

See merge request !1385
2015-01-12 16:57:20 +00:00
Marc Radulescu ce6b0519cc remove duplication by linking EE features directly to website 2015-01-12 16:47:39 +01:00
Marin Jankovski 0a089661fd Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class. 2015-01-12 13:35:29 +01:00
Marin Jankovski ef0cf7b42d Fix the api project ordering spec. 2015-01-12 11:49:07 +01:00
Marin Jankovski 8689ce1efe Add search filter option on project api for authorized projects. 2015-01-12 11:08:53 +01:00
Dmitriy Zaporozhets 4e7df0037a Fix ci data in hook when create git tag via UI 2015-01-12 00:05:04 -08:00
Dmitriy Zaporozhets 3197044512 Refactor push data builder. Moved it to separate class
Also execute GitLab CI on creating tag via UI
2015-01-11 23:51:31 -08:00
Dmitriy Zaporozhets 31bcd04711 Merge branch 'gitlab-ci-on-tag' into 'master'
When push tag - trigger GitLab CI

See merge request !1383
2015-01-11 17:08:49 +00:00
Dmitriy Zaporozhets f31a96104f Add flatten-dir branch to seed repo 2015-01-10 22:48:16 -08:00
Dmitriy Zaporozhets 2543af84f0 Execute GitLab CI on tag push 2015-01-10 22:18:14 -08:00
Dmitriy Zaporozhets f891ababeb Fix randomly failing test 2015-01-10 21:42:16 -08:00
Dmitriy Zaporozhets 78bf00c788 Merge branch 'fix-git-blame' into 'master'
Fix File blame not respecting branch selection

See merge request !1382
2015-01-11 05:17:09 +00:00
Dmitriy Zaporozhets 4666515538 Merge branch 'flatten-dirs' into 'master'
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
2015-01-11 04:42:28 +00:00
marmis85 02adb9ccd6 point to a specific branch in the test repo to avoid conflicts 2015-01-11 05:07:34 +01:00
Valery Sizov ee28ee5f13 rspec fix 2015-01-10 20:04:06 -08:00
Dmitriy Zaporozhets 49eacb84e9 Update CHANGELOG 2015-01-10 19:52:27 -08:00
Dmitriy Zaporozhets 13b86fcb02 Fix git blame on file not respecting branch selection 2015-01-10 19:50:35 -08:00
Dmitriy Zaporozhets e9bf4e411f Merge branch 'release-doc' into 'master'
Release doc

See merge request !1381
2015-01-11 03:33:57 +00:00
Sytse Sijbrandij 37163d7c75 Small spelling improvements. 2015-01-10 19:28:50 -08:00
Dmitriy Zaporozhets 9698f07763 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-10 19:26:17 -08:00
Dmitriy Zaporozhets b758b4c80b If noteable is nil - make discussion outdated 2015-01-10 19:26:00 -08:00
Sytse Sijbrandij a28cad0cf3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into prose-requirement 2015-01-10 19:19:44 -08:00