Commit Graph
5946 Commits
Author SHA1 Message Date
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Jacob Vosmaer 5e0e97ec5d Remove reference to broken auth icon functionality 2013-07-29 11:12:44 +02:00
Yves Senn 205107fea1 Merge pull request #4651 from mahmouds/patch-1
fix typo
2013-07-28 22:47:37 -07:00
Dmitriy Zaporozhets cb86cf844c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-07-27 20:22:56 +03:00
Dmitriy Zaporozhets b5668234b1 Remove unecessary %br in help area 2013-07-27 19:34:37 +03:00
Mahmoud Mostafa 3648c83ec0 fix typo 2013-07-27 13:25:40 +03:00
Dmitriy Zaporozhets 04806be3bf Merge pull request #4634 from jacargentina/master
Added show user name as a tooltip on issue participants list
2013-07-27 00:45:39 -07:00
Dmitriy Zaporozhets 2db010b6a3 Show tooltip with author email for commit 2013-07-27 10:40:38 +03:00
Javier Castro 994ad1cbc1 Added show user name as a tooltip on every call to link_to_member when the name is not shown inline 2013-07-26 13:23:26 -03:00
Jacob Vosmaer 06e98c0f9b Merge pull request #4619 from thomasbiddle/merge_request_api
Adding links to the merge requests and group documentation.
2013-07-26 08:00:42 -07:00
TJ Biddle 4261a5a1ea Adding links to the merge requests and group documentation. 2013-07-26 07:53:35 -07:00
Jacob Vosmaer 8aecfc375c Improve grammar of label hints 2013-07-24 17:26:14 +02:00
Yves Senn 20365121e0 Merge pull request #4606 from chaixl/master
Add assets precompile step for fixing activities lost and some UI style issues
2013-07-23 02:35:13 -07:00
Jacob Vosmaer 707cea8d45 Merge pull request #4600 from lukaselmer/patch-1
Replace vim by editor
2013-07-22 01:28:50 -07:00
Yves Senn f602be2e28 Merge pull request #4605 from jvanbaarsen/installation-manual-fix
Fixed an old reference to puma
2013-07-21 03:41:21 -07:00
Chai Xue Liang 7d6960104d Add assets precompile step for fixing activities lost and some UI style issues 2013-07-20 04:20:21 -07:00
Jeroen van Baarsen 2a5e05cfd8 Fixed an old reference to puma 2013-07-20 12:31:13 +02:00
Lukas Elmer 66d239f972 Replace vim by editor 2013-07-19 17:29:10 +02:00
Dmitriy Zaporozhets d3c429ed21 Doc for update from 5.3 to 5.4 2013-07-18 19:32:13 +03:00
Dmitriy Zaporozhets 4f65509cbf Merge branch 'nginx_alternatives_in_recipes' of /home/git/repositories/gitlab/gitlabhq 2013-07-18 16:22:35 +00:00
Dmitriy Zaporozhets da07665bc8 Merge pull request #4289 from karlhungus/feature-ldap-signin-with-email-or-username
Allow the ldap logins with email or username
2013-07-18 09:20:50 -07:00
Jacob Vosmaer d3e94eef4a Refer to recipes for nginx alternatives 2013-07-18 15:36:01 +02:00
Izaak Alpert d04f32866f Default allow username or email login to false
-If not specified in the gitlab.yml default this setting to false

Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
2013-07-18 09:33:12 -04:00
Izaak Alpert 1a31cb2c37 Update the proc/lamda to be consistent
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
2013-07-18 09:33:12 -04:00
Izaak Alpert 089605fe6b Allow the ldap logins with email or username
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
2013-07-18 09:33:12 -04:00
Dmitriy Zaporozhets 2c191ab06c Merge branch 'improve/snippets' of /home/git/repositories/gitlab/gitlabhq 2013-07-18 11:12:01 +00:00
Dmitriy Zaporozhets 98e1597f8c Fix tests 2013-07-18 14:11:17 +03:00
Dmitriy Zaporozhets 4a72f5d82a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-07-18 14:02:04 +03:00
Ariejan de Vroom afa1a20de1 Revert "Update installation.md"
This reverts commit 670e1be7a4.
2013-07-18 12:59:41 +02:00
Ariejan de Vroom 2d9bbe662e Revert "Update installation.md"
This reverts commit b5cd66d41d.
2013-07-18 12:59:18 +02:00
Dmitriy Zaporozhets 475f607a22 Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stored in different location 2013-07-18 13:55:01 +03:00
Dmitriy Zaporozhets 33347efa26 User links to user snippets 2013-07-18 13:33:43 +03:00
Ariejan de Vroom 4b47a58f2f Merge pull request #4564 from mpwoodward/patch-2
Update installation.md
2013-07-18 03:27:03 -07:00
Ariejan de Vroom 5a5d34e240 Merge pull request #4563 from mpwoodward/patch-1
Update installation.md
2013-07-18 03:26:26 -07:00
Ariejan de Vroom 033abfca10 Merge pull request #4583 from szicari-cars/master
Updated README.md
2013-07-18 03:23:57 -07:00
Dmitriy Zaporozhets 82e1fe4675 Minor ui fix for snippet 2013-07-18 13:22:47 +03:00
Dmitriy Zaporozhets b1fbd65832 Improve UI for project snippets 2013-07-18 13:21:56 +03:00
Dmitriy Zaporozhets bbb06e504e Add seeds and improve ui. Remove snippet expires_at 2013-07-18 13:08:48 +03:00
Dmitriy Zaporozhets 02e39563c8 better ui for protected branches page 2013-07-18 12:06:51 +03:00
Dmitriy Zaporozhets fe7bef3a53 squash commit summary in one sentence 2013-07-18 11:49:40 +03:00
Dmitriy Zaporozhets ba33ed4140 Fix new-tag-btn align 2013-07-18 10:29:45 +03:00
Sean Zicari 87e8c2dc3d Update README.md
Updated the relative links in ## Contents to point to the correct documents.
2013-07-17 13:51:12 -07:00
Dmitriy Zaporozhets fd03367193 Update font-awesome. Use proper class for merge request form 2013-07-17 18:35:28 +03:00
Dmitriy Zaporozhets b98f414a1b Merge branch 'key_uniqueness' of /home/git/repositories/gitlab/gitlabhq 2013-07-17 14:03:53 +00:00
Jacob Vosmaer aa0473d0eb Validate fingerprint uniqueness 2013-07-17 15:17:18 +02:00
Jacob Vosmaer 656d800f8c Use Tempfile.open for automatic cleanup 2013-07-17 15:17:18 +02:00
Jacob Vosmaer 3ada8f45c7 Remove unnecessary user from test 2013-07-17 15:17:17 +02:00
Dmitriy Zaporozhets dcac37d9e4 Restyle MR form page 2013-07-17 15:48:22 +03:00
Dmitriy Zaporozhets 8587e3a357 create corresponding events when create branch/tag with UI 2013-07-17 15:11:03 +03:00
Dmitriy Zaporozhets 2a37db4c9e remove unnecessary %br and title 2013-07-17 14:53:23 +03:00