Dmitriy Zaporozhets
a37f8fc6db
Merge branch 'new_sidekiq_cli_syntax' into 'master'
...
New Sidekiq CLI syntax
2014-04-01 16:27:54 +00:00
Sytse Sijbrandij
69432c885c
Merge branch 'jira_issue_reference' into 'master'
...
Explain how to refer to JIRA issues
2014-04-01 15:11:12 +00:00
Sytse Sijbrandij
603bcfcbff
Merge branch 'sidekiq_version_in_env_info' into 'master'
...
Show Sidekiq version in gitlab:env:info
2014-04-01 15:10:48 +00:00
Marc Radulescu and Jacob Vosmaer
cf788f3d97
fix JIRA documentation by explaining how to reference JIRA issues in GitLab comments
2014-04-01 17:03:58 +02:00
Jacob Vosmaer
03b14bb814
Use the new Sidekiq syntax to specify queues
...
This syntax is compatible with the current Sidekiq version we use
(2.17.0) and it protects us against future breakage by
https://github.com/mperham/sidekiq/commit/040eda558bc64139c846c781d3de0b79603e3035
2014-04-01 16:46:27 +02:00
Jacob Vosmaer
bbea1d1a72
Include the Sidekiq version in gitlab:env:info
2014-04-01 16:05:26 +02:00
Dmitriy Zaporozhets
3b0510a7c1
Use ruby 1.9 hash syntax in Guardfile
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-01 13:08:16 +03:00
Dmitriy Zaporozhets
24ea884fab
add spring to guard
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-01 12:30:07 +03:00
Dmitriy Zaporozhets
9be05a430b
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-04-01 12:28:21 +03:00
Dmitriy Zaporozhets
1069ffb873
Merge branch 'branch-via-api' into 'master'
...
Create branch via API
Fixes #1096
2014-04-01 09:27:46 +00:00
Dmitriy Zaporozhets
2d3d210b64
Merge branch 'user-search' into 'master'
...
User-search
2014-04-01 09:25:41 +00:00
Dmitriy Zaporozhets
27ceb6be0d
Merge branch 'deploy-key-doc-improvement' into 'master'
...
Deploy-key-doc-improvement
2014-04-01 09:12:45 +00:00
dosire
9ae11007fe
Mention search options.
2014-04-01 10:41:57 +02:00
dosire
799361a389
SSH section was missing in doc and corrected the deploy key section.
2014-04-01 10:28:55 +02:00
Dmitriy Zaporozhets
a88225b768
Update changelog with new feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-01 10:45:10 +03:00
Dmitriy Zaporozhets
d7afdab7a5
Add docs for create branch via api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-01 10:44:58 +03:00
Dmitriy Zaporozhets
33a00ceeea
Create branch via API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-01 10:39:53 +03:00
Dmitriy Zaporozhets
95b84e2c5a
Move branch creation logic in service
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-01 10:33:23 +03:00
Dmitriy Zaporozhets
b98bd5c8d0
Merge branch 'link-to-doc-site' into 'master'
...
Link-to-doc-site
2014-04-01 07:29:40 +00:00
dosire
230335650d
Link to doc site from the readme.
2014-04-01 09:19:37 +02:00
Sytse Sijbrandij
a9af2e5d83
Merge pull request #6667 from Razer6/update_workflow_doc
...
Improve doc/workflow.md for doc.gitlab.com
2014-03-31 21:35:15 +02:00
Sytse Sijbrandij
e5a0713f0e
Merge branch 'hyphens-in-doc-filename' into 'master'
...
Hyphens-in-doc-filename
2014-03-31 16:23:49 +00:00
dosire
f6189a9f07
Use underscores in doc filename like elsewhere.
2014-03-31 18:23:10 +02:00
Robert Schilling
2496f85d46
Fix rendering for enumeration for doc page
2014-03-31 18:10:20 +02:00
Dmitriy Zaporozhets
83941ca208
Merge branch 'pagination-link-header-doc' into 'master'
...
Pagination-link-header-doc
2014-03-31 16:04:28 +00:00
Dmitriy Zaporozhets
9fdc6e9700
Merge branch 'typo-in-docs' into 'master'
...
Typo-in-docs
2014-03-31 16:04:08 +00:00
Sytse Sijbrandij
dfc92cd25d
Merge pull request #6663 from Razer6/fix_integration_link
...
Fix link to isue tracker integration page
2014-03-31 17:39:51 +02:00
Dmitriy Zaporozhets
bd1b15ec29
Merge branch 'branch-via-api' into 'master'
...
Refactor branches API
Preparing for new feature: Create branches via API
2014-03-31 14:46:57 +00:00
Dmitriy Zaporozhets
8f3701eff0
Move branches API docs to separate file
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-31 16:43:45 +03:00
Dmitriy Zaporozhets
9b276f0003
Move branches api to separate class
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-03-31 16:31:53 +03:00
Dmitriy Zaporozhets
2ab2d60b9e
Merge pull request #6660 from robertboloc/patch-1
...
Grammar correction: "View in Gitlab"
2014-03-31 15:55:07 +03:00
Robert Schilling
8da35fe26e
Fix link to isue tracker integration page
2014-03-31 14:49:57 +02:00
dosire
24f64e65a6
Add documentation for https://github.com/gitlabhq/gitlabhq/pull/5469
2014-03-31 13:16:52 +02:00
Dmitriy Zaporozhets
046fa9bdb1
Merge pull request #5469 from NARKOZ/api-pagination-headers
...
add 'Link' header for API response
2014-03-31 13:46:57 +03:00
Robert Boloc
dd32c9f0ed
Updated notification message
2014-03-31 12:24:55 +02:00
Dmitriy Zaporozhets
8769b7ab97
Merge branch 'repo_downloads_dir' into 'master'
...
Configurable repo downloads path
2014-03-31 10:20:13 +00:00
Jacob Vosmaer
eeeaaa4bc1
Explain the default repository_downloads_path
2014-03-31 12:19:37 +02:00
Jacob Vosmaer
200eeea258
Make the repository downloads path configurable
2014-03-31 12:19:37 +02:00
Robert Boloc
3055331965
Grammar correction: "View in Gitlab"
...
Changed to "View on Gitlab"
2014-03-31 12:05:41 +02:00
dosire
f43a6339d7
Different filename.
2014-03-30 17:36:32 +02:00
Dmitriy Zaporozhets
0488e34ba7
Merge branch 'refactor_project_watchers_notifications' into 'master'
...
Refactor project watchers notifications
2014-03-29 12:10:53 +00:00
Dmitriy Zaporozhets
fdeacf0ad1
Merge pull request #6317 from jirutka/fix-ldap-dn-case
...
Fix searching by extern_uid for LDAP to be case-insensitive
2014-03-29 14:08:31 +02:00
Dmitriy Zaporozhets
5fef54589d
Merge pull request #6644 from tombruijn/list-item-name-spacing
...
.well-list item name spacing fix Follow up on #6643
2014-03-28 22:45:29 +02:00
Dmitriy Zaporozhets
48bd8a7e16
Merge remote-tracking branch 'origin/rake_drop_tables'
...
Conflicts:
CHANGELOG
2014-03-28 22:37:17 +02:00
Marin Jankovski
c34186f882
Refactor project watchers collecting.
2014-03-28 17:51:13 +01:00
Dmitriy Zaporozhets
e6fbf79bc5
Merge branch 'ldap_nickname' into 'master'
...
Remove omniauth-ldap nickname bug workaround
2014-03-28 13:28:54 +00:00
Jacob Vosmaer
2e6b537018
Use omniauth nickname as the username for LDAP
...
Before there was a bug in omniauth-ldap which prevented samaccountname
showing up as a possible username for new LDAP users. Thanks to upstream
fixes, we no longer need to work around this bug.
2014-03-28 13:57:52 +01:00
Jacob Vosmaer
77b57c114b
Drop all tables before restoring a PostgreSQL DB
...
Invoking 'db:schema:load' turned out to be a bad idea: when downgrading
an existing GitLab installation, the schema of the newer version would
be preserved when trying to import the old version.
2014-03-28 13:44:46 +01:00
Jacob Vosmaer
f48fc3c6cb
Add a rake task that drops all tables
2014-03-28 13:37:09 +01:00
Tom de Bruijn
ce857b7cc9
Improve alignment of labels in .well-list items
2014-03-28 13:22:43 +01:00