Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Commits on Jun 29, 2012
@earldouglas earldouglas cleanup the wording of the notification footer cc73693
Commits on Jul 06, 2012
@NARKOZ NARKOZ refactor projects API 0f604e6
Commits on Jul 20, 2012
@seeingidog seeingidog Add comments to Wiki pages 36efa20
@seeingidog seeingidog Show wiki comments for all revisions 04a85f4
Commits on Jul 21, 2012
@patthoyts patthoyts Handle LDAP missing credentials error with a flash message.
If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.

The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit f322975.

This resolves issue #1077.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
a2d244e
@patthoyts patthoyts Create the githost.log file if necessary.
This resolves issue #1121.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
6035ad7
Commits on Jul 24, 2012
@robbytaylor robbytaylor Updated merge request subheading.
Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.
dce6f7b
@NARKOZ NARKOZ add issues API 7b33d8c
@NARKOZ NARKOZ update API docs 024e034
@NARKOZ NARKOZ Merge branch 'master' into api eca823c
@NARKOZ NARKOZ update help section with issues API docs fbb4110
Commits on Jul 25, 2012
@randx randx Merge pull request #1135 from NARKOZ/api
Issues API
b683a71
@randx randx Merge pull request #1122 from patthoyts/pt/missing-log
Create the githost.log file if necessary.
60d3e94
@randx randx Merge pull request #1118 from patthoyts/pt/ldap-missing-password
Handle LDAP missing credentials error with a flash message.
92d98f5
@NARKOZ NARKOZ API: ability to get project by id 1b95c8b
@NARKOZ NARKOZ API: update docs 949b1df
@NARKOZ NARKOZ API: expose issues project id f7dd067
@NARKOZ NARKOZ return 404 if project not found cb32e03
@randx randx Merge pull request #1142 from NARKOZ/api
API changes
f9c6d8a
@randx randx Merge pull request #1133 from robbytaylor/master
Updated merge request subheading.
0584851
@randx randx Merge pull request #1127 from riyad/use-decorators
Use CommitDecorator more
5133541
@randx randx Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitla…
…bhq into seeingidog-add_wiki_comments

Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
61c8533
@randx randx Remove recreated mailer controller for admin 0296121
@randx randx Fix compare crash after decorator refactoring 501ca8e
@randx randx Styled wiki area. fixed commit feed feature 14c9723
@riyad riyad Update links to commits cbce452
@riyad riyad Update links to issues 73dabcb
@riyad riyad Update links to merge requests e6bb4f1
@riyad riyad Update links to milestones 0aee7c9
@riyad riyad Fix styles
* don't show pointer cursor for for the whole list item any more
* fix hover color for links in .row_title
6fc6833
@riyad riyad Update links in events f6a67ef
Commits on Jul 26, 2012
@randx randx Fixed dashboard loader, fixed 404 for reporter on empty wiki page.
Styled Wiki edit page
c27105f
@randx randx Fixed persmission issue in doc. Added validation of hooks in gitlab:a…
…pp:status
18f8301
@meskyanichi meskyanichi Modified the `repo_dump` and `repo_restore` rake tasks to properly du…
…mp and restore repositories based on their `path` rather than their (project) `name`. The project name can be uppercase and may contain spaces. This caused the repository to be restored as a different `path` that it was initially created as, thus, breaking the `git remote` and the web interface can no longer detect the repository either because it searches by `path` and not by `name`. Also, when restoring the permissions are incorrect making it impossible to push new commits to the remote repository. So now on success it'll set the correct permissions (but requires that the `gitlab` user has `sudo` privileges, or this task must be executed as root).
ec01cbe
Commits on Jul 27, 2012
@randx randx Merge pull request #1129 from meskyanichi/master
Potential solution for current `rake gitlab:app:backup_restore` issues.
67ef96e
@randx randx commit.short_id as model method. Styled inline comment form 0590aa9
@meskyanichi meskyanichi Post-receive hook should be owned by gitlab user, not git. 19f7b03
@randx randx Merge pull request #1154 from meskyanichi/master
As per request: Post-receive hook should be owned by gitlab user, not git.
34e3327
@randx randx Merge pull request #1144 from riyad/break-up-links-with-nested-format…
…ing-rebased

Break up links with nested formating (rebased)
f69049c
@randx randx Fix issue padding cause PR 1144 9a709f7
@randx randx Better visibility of event commit links & commits ids bc78971
@randx randx fix commits spec 3caf0aa
Commits on Jul 28, 2012
@tomykaira tomykaira Fix #1009 Replace all special characters in user's identity 03a2995
@randx randx Merge pull request #983 from JamesEarlDouglas/notify-grammar
cleanup the wording of the notification footer
354d243
@randx randx Merge pull request #1163 from tomykaira/bug_1009
Fix #1009 Replace all special characters in user's identity
e1344a0
@randx randx CSS refactoring. Notes better styled 4c1267e
@randx randx Team Member Profile: Remove button rebased c2817e6
Commits on Jul 29, 2012
@randx randx Styled Source Browse c6034af
@randx randx Better name for Project push methods module 2cf5a9e
@randx randx Better cucumber coverage for dashboard 2178104