957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
6b9dbe9f5a
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-05 14:51:24 +02:00
58c0c86dbd
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2015-08-05 14:50:32 +02:00
7538be71e0
Merge branch 'update_release_doc' into 'master'
...
update release doc
See merge request !1097
2015-08-05 12:42:03 +00:00
72943ee7e2
Merge branch 'server-note' into 'master'
...
Added note about changing servers
Because of tweet https://twitter.com/elraro21/status/628650106850516992
See merge request !1919
2015-08-05 12:39:16 +00:00
a567dd20d4
update release doc
2015-08-05 14:11:25 +03:00
fbbfa774c2
update chnagelog
2015-08-05 13:42:27 +03:00
99124cece0
gitlab-shell bump to 2.6.4
2015-08-05 13:32:19 +03:00
caf4c0dd87
Merge branch 'ci-skipped-status' into 'master'
...
Added support for CI skipped status
This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216
See merge request !1073
2015-08-05 10:09:07 +00:00
764124c380
Merge branch 'revert_touch' into 'master'
...
Revert "Update noteable after a new note is added"
This reverts commit fbdaf0e2a5https://gitlab.com/gitlab-org/gitlab-ce/issues/2027
See merge request !1094
2015-08-05 09:57:27 +00:00
1cb8588c66
Remove satellites from requirements docs and add CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-05 11:49:02 +02:00
c8d00787c2
Merge branch 'add-resend-confirm-email-admin-page' into 'master'
...
Add "Confirm user" button to admin page
### What does this MR do?
This MR adds a "Confirm user" to the admin user page.
### Why was this MR needed?
There is no way for an admin to force a user confirmation. Some users create users in the API and then don't have a way to force the user into a confirmed state.
Originally, I attempted to add a link to allow the admin to resend a confirmation e-mail. But that may not be helpful because a user can be in the unconfirmed state with no `unconfirmed_email` set.
### Screenshot
### What are the relevant issue numbers?
* Closes #2116
* Closes https://github.com/gitlabhq/gitlabhq/issues/9502
See merge request !1067
2015-08-05 09:43:03 +00:00
46a84d8013
Merge branch 'rs-issue-2135' into 'master'
...
Update docs for Ruby MRI 2.1 requirement
Addresses #2135
See merge request !1089
2015-08-05 09:21:03 +00:00
734f97ae11
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-05 11:19:01 +02:00
7b4225bdb2
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-05 11:18:47 +02:00
6caa03d422
Merge remote-tracking branch 'public/project-buttons'
2015-08-05 11:18:28 +02:00
ab8c71de4e
Fix merge request creation without branch selected
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-05 11:03:41 +02:00
6353ca9ae8
Revert "Update noteable after a new note is added"
...
This reverts commit fbdaf0e2a5
2015-08-05 12:00:12 +03:00
0f785bbc7e
ink to configured gravatar host on profile page
2015-08-05 00:48:16 -07:00
0c1ccda43f
Add "Confirm user" button in user admin page
...
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
2015-08-05 00:35:53 -07:00
96bb42e5a7
Merge branch 'semaphore-shield' into 'master'
...
Update the Semaphore badge to the shield badge type
**Why is this needed?**
It just does look better in the Readme :-)
See merge request !1092
2015-08-05 07:04:00 +00:00
9076b5026b
Update the Semaphore badge to the shield badge type
...
**Why is this needed?**
It just does look better in the Readme :-)
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-08-05 08:07:35 +02:00
c90e592e91
Replace relative url with full path, remove old reference for indexes
...
Closes #2176 (gitlab.com)
2015-08-05 08:38:40 +03:00
ee0fc2c3ad
Put author name at the end of a tree row
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-08-05 00:12:13 +02:00
4c9ba632e9
Merge branch 'master' into 'master'
...
updated restore docs wrt backup location [ci skip]
Made sure to point out that the restore location can be overwritten by
an entry in the config.
See merge request !1030
2015-08-04 21:56:27 +00:00
b83b333217
added note about changing servers
2015-08-04 14:51:08 -07:00
f9d71c4b91
Update docs for Ruby MRI 2.1 requirement
2015-08-04 17:07:12 -04:00
e9bbea7048
Don't hide the clone holder for an empty project
2015-08-04 16:58:14 -04:00
44ac823e59
Improve tests to use real branches in merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 17:20:26 +02:00
427b5df260
Added support for CI skipped status
2015-08-04 16:47:19 +02:00
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
c17f5d06aa
Fix merge api and spec
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:33:53 +02:00
88a3cfe107
Merge branch 'rs-fix-rouge-inline-theme' into 'master'
...
Fix the `inline_theme` option for the Rouge formatter
See merge request !1083
2015-08-04 14:08:49 +00:00
326b827ce3
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-04 15:23:11 +02:00
4ccd767abf
Only publish ssh key-type and key
2015-08-04 14:33:18 +02:00
58c76605b3
Merge branch 'update-mr-branch-text' into 'master'
...
Update merge request text to reflect editability of source/target branch
Screenshot 1 (source branch deleted):
Screenshot 2 (target branch deleted):
Closes #2134
See merge request !1085
2015-08-04 09:01:54 +00:00
e9ba1185f2
Merge branch 'add-user' into 'master'
...
Added new doc about adding users and members
Added new doc in workflow about how to add users and members and I also linked it to "permissions".
See merge request !1916
2015-08-04 08:46:47 +00:00
c5a6c16dba
typo
2015-08-03 15:55:02 -07:00
28cc6d9b98
text fixed
2015-08-03 15:51:09 -07:00
88ae5a9b20
fixed terminology
2015-08-03 15:36:26 -07:00
8221236df1
Update merge request text to reflect editability of source/target branch
...
Closes #2134
2015-08-03 07:11:04 -07:00
8ec7025a5d
Link to admin raketask
2015-08-03 11:33:48 +00:00
cc4405db7d
Merge branch 'add-license'
2015-08-03 11:05:19 +02:00
c1c89500f3
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-03 11:04:20 +02:00
b118f648cb
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-03 11:04:04 +02:00
0e994615a0
Merge branch 'redis-store' into 'master'
...
Bump redis-store to 1.1.6 and remove redis-store-fix-expiry
According to this https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.6 and my manual tests the monkey patch for redis-store is no longer required
/cc @jacobvosmaer @rspeicher
See merge request !1081
2015-08-03 08:58:36 +00:00
b8433cb886
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-02 12:53:08 -07:00
ef707ebfac
Merge pull request #9520 from gipcompany/annotate-models-update
...
Re-annotate models
2015-08-02 10:39:19 -07:00
4f9d32eab0
typo
2015-08-02 09:54:42 -07:00
f33898ecfb
Re-annotate models
2015-08-03 01:52:54 +09:00
Dmitriy Zaporozhets
Job van der Voort
Valery Sizov
Kamil Trzciński
Sytse Sijbrandij
Ben Bodenmiller
Stan Hu
Robert Schilling
Jeroen van Baarsen
Achilleas Pipinellis
Sven Strickroth
karen Carias
Robert Speicher
Zeger-Jan van de Weg
Douwe Maan
Atsushi Ishida
