deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4187 commits 6 branches 43 tags 25 MiB
Commit graph

626 commits

Author SHA1 Message Date
Tanguy Herrmann
70ef433e09 Rewording for the account being blocked 
When signing in with SSO, if the default behaviour of gitlab is to block SSO user, the only message the people will get is 'Your account was blocked'

They should get the idea this might be only temporary and not because of a technical problem
 2012-11-24 18:21:57 +01:00
Robert Speicher
30a66c065a Improve user feedback on the Profile > Design page 
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
 2012-11-21 15:01:40 -05:00
Martins Polakovs
8c5b79a923 Fixes :notice after project is created 
When projects were created in projects_controller
create.js.haml passed notice as url parameter and
therefore notice was not displayed in the page after
redirect to the project page
 2012-11-21 14:30:35 +02:00
Dmitriy Zaporozhets
898d09a21e Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed 2012-11-21 12:45:15 +02:00
Dmitriy Zaporozhets
f5551efdfd Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues 2012-11-27 09:31:15 +03:00
Dmitriy Zaporozhets
70bf7f6e19 Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo 2012-11-21 08:54:05 +03:00
Dmitriy Zaporozhets
285743eee1 Merge pull request #2070 from jouve/fix_destroy_project 
fix destroy project from admin
 2012-11-27 01:53:24 -08:00
Cyril
b382ce4d91 fix destroy project from admin 2012-11-26 01:22:44 +01:00
Dmitriy Zaporozhets
97a92f8ae7 Fixed user.namespace_id exception if namespace is nil 2012-11-25 12:26:34 +02:00
Dmitriy Zaporozhets
f37fa968b2 add ability to change namespace from project edit page 2012-11-24 22:00:30 +02:00
Dmitriy Zaporozhets
f997947664 Project can be transfered to namespace and out now 2012-11-24 12:37:30 +02:00
Dmitriy Zaporozhets
0e1635a68a Fixing requests after namespaces. Fixed admin bug with access to project 2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets
9304d049de Fixed some tests and snippet colorize 2012-11-23 22:31:09 +03:00
Dmitriy Zaporozhets
c50ec72b52 Deprecate code for Project. Use title and path 2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
f17ddeb394 Make admin project list more useful 2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets
552b3105fb Fixed admin area. Create project only from one place 2012-11-23 07:31:09 +03:00
Dmitriy Zaporozhets
26622f4c8f Improve routing. Project access via namespace 2012-11-22 23:34:06 +03:00
Dmitriy Zaporozhets
71214bee75 Move directory with project. Fixed all related path methods to use namespace 2012-11-22 22:41:26 +03:00
Dmitriy Zaporozhets
23734a715e Dashboard filters for events 2012-11-21 08:24:05 +03:00
Dmitriy Zaporozhets
e750efd9fc Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests 
Diff and patch for commits and merge requests
 2012-11-26 04:40:49 -08:00
Riyad Preukschas
2b1afa0e62 Remove merge_request#raw and replace it with formats to #show 
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
 2012-11-25 00:05:44 +01:00
Riyad Preukschas
3b7c2adf0a Add diff format to commit#show 2012-11-22 20:49:44 +01:00
Riyad Preukschas
6ddf4567f4 Don't escape Html in patches 
Fixes #2036
 2012-11-22 12:45:39 +01:00
Dmitriy Zaporozhets
dc9916b474 Merge pull request #1998 from erroric/gitlabhq_issue1669 
fix for issue #1669
 2012-11-20 14:10:45 -08:00
Dmitriy Zaporozhets
9f65c274ef Fix ci service creation logic 2012-11-20 14:16:04 +02:00
Dmitriy Zaporozhets
406a0c809b GitLabCi Service imtegration 2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets
4eef112462 Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner 
Cannot remove user that owns a project.
 2012-11-19 04:12:31 -08:00
Sergey Linnik
bb3fc1e04e add order to projects admin page 2012-11-18 22:36:22 +04:00
Alexey Loktionov
31bf0cd876 fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance 2012-11-16 22:31:17 +04:00
Marin Jankovski
19e8473eb7 Cannot remove user that owns a project. 
Cannot remove user that owns a project.

Make lines shorter, set alert, use path instead of url.
 2012-11-16 14:47:07 +01:00
randx
1c5b2a5153 Stats page 2012-11-10 23:08:47 +02:00
Saito
b664b784f1 linguist and web browser will take care of mimetype and encoding problem. 2012-11-10 01:06:20 +08:00
Saito
f1ac2a616b remove encode lib, clean all encoded area. 2012-11-09 01:41:07 +08:00
Dmitriy Zaporozhets
8114d36caf Merge pull request #1720 from coagulant/wiki_search 
Wiki search
 2012-11-07 03:51:20 -08:00
Riyad Preukschas
be4138af75 Log caught exceptions 2012-11-06 21:16:47 +01:00
Dmitriy Zaporozhets
f555578414 Added EventFilter class. Compeleted first version of dashbaord filtering 2012-11-05 20:12:26 +02:00
Valeriy Sizov
4f04d7df66 Merge pull request #1915 from tsigo/issue/1912 
Fix rendered action for password change failure
 2012-11-05 01:29:03 -08:00
Robert Speicher
89d9319a79 Fix rendered action for password change failure 
Closes #1912
 2012-11-04 16:47:37 -05:00
randx
f082c8ae2a Decouple and refactor GraphCommit 2012-11-04 23:43:33 +02:00
randx
f417a265d7 Finalize milestones for Merge Requests 2012-10-29 23:45:11 +02:00
randx
ecdf778e80 Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr 
Conflicts:
	app/views/merge_requests/_form.html.haml
 2012-10-29 21:37:46 +02:00
Sergio Visinoni
e51c37bdbd Display Merge Requests <-> Milestone relations 
Show the relation between Merge Requests and Mileston in different
places:
- Merge Request page
- Milestone list page
- Milestone details page
 2012-10-26 16:12:40 +02:00
Riyad Preukschas
700a784bc9 Refactor EditFileAction#update and rename it to commit! 2012-10-26 01:59:50 +02:00
Riyad Preukschas
5f16687805 Update arguments for Gitlab::Satellite::EditFileAction#initialize 2012-10-26 00:39:23 +02:00
Riyad Preukschas
55779b00ea Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction 2012-10-26 00:33:53 +02:00
Dmitriy Zaporozhets
fd0aca1225 Feature implemented 2012-10-24 14:20:53 +03:00
randx
83dc5f9362 Fix issue with removing group 2012-10-22 21:21:34 +03:00
randx
0189ee97ed Security for online editor. Replace dev_access?, master_access? with can? method usage 2012-10-21 12:12:14 +03:00
randx
e0c43c46dd Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard 2012-10-17 22:02:52 +03:00
Ilya Baryshev
e6524a919e Wiki search 
Very basic, using LIKE, and no search snippets.
 2012-10-16 23:05:11 +04:00
Riyad Preukschas
8e8d82d49a Only allow editing text files 2012-10-16 12:45:48 +02:00
Riyad Preukschas
ad5a6a4ae1 Improve flash messages in tree#update 2012-10-16 12:45:30 +02:00
randx
809aefb828 Minor improve to UI and code formatting of gitlab web editor 2012-10-15 19:51:11 +03:00
Valeriy Sizov
42bdfd021b WebEditor: base implementation 2012-10-12 20:07:24 +03:00
Valeriy Sizov
0b3e9fd218 WebEditor: Check if save is possible 2012-10-12 20:07:24 +03:00
Valeriy Sizov
e53b47b447 WebEditor: sceleton 2012-10-12 20:07:24 +03:00
Valeriy Sizov
f6a8e69449 WebEditor: base form 2012-10-12 20:07:23 +03:00
Dmitriy Zaporozhets
baf94bd732 Merge pull request #1675 from robbkidd/separate_mr_observer 
Separate observing of Note and MergeRequests
 2012-10-11 09:35:21 -07:00
Robb Kidd
16ceae895e Separate observing of Note and MergeRequests 
* Move is_assigned? and is_being_xx? methods to IssueCommonality

  This is behavior merge requests have in common with issues. Moved
  methods to IssueCommonality role. Put specs directly into
  merge_request_spec because setup differs for issues and MRs
  specifically in the "closed" factory to use.

* Add MergeRequestObserver. Parallels IssueObserver in almost every way.

  Ripe for refactoring.

* Rename MailerObserver to NoteObserver

  With merge request observing moved out of MailerObserver, all that
  was left was Note logic. Renamed to NoteObserver, added tests and
  updated application config for new observer names. Refactored
  NoteObserver to use the note's author and not rely on current_user.

* Set current_user for MergeRequestObserver

  IssueObserver and MergeRequestObserver are the only observers that
  need a reference to the current_user that they cannot look up on
  the objects they are observing.
 2012-10-10 17:59:25 -04:00
Robert Speicher
ace816354f Add toggle to show closed issues on Milestones#show 
Progress on #1167
 2012-10-10 12:43:59 -04:00
Riyad Preukschas
3f72af9994 Make notes for merge requests include commit notes and add helpers 2012-10-10 12:06:30 +02:00
Robert Speicher
702133c0e2 Remove unused history_path instance variable 2012-10-09 18:39:03 -04:00
randx
679d0d6d76 Context refactoring. Move Issues list, Search logic to context 2012-10-09 22:09:46 +03:00
randx
63fe042d97 project.issues_labels method 2012-10-09 20:39:06 +03:00
randx
c348284fed Reduce count of projects on dashboard to 20 2012-10-09 10:01:07 +03:00
randx
ce1b742b1e Group: new link on dashboard if admin. Fixed people count 2012-10-09 09:46:20 +03:00
Valeriy Sizov
a635b9da97 Revert "Do not allow removal of a project owner user." 
This reverts commit 927d0cc267.
 2012-10-08 15:57:30 +03:00
Valeriy Sizov
fc3c0592db Merge pull request #1651 from dosire/user_can_be_removed_if_its_not_a_project_owner 
Do not allow removal of a project owner user.
 2012-10-08 05:42:47 -07:00
Marin Jankovski
927d0cc267 Do not allow removal of a project owner user. 2012-10-08 12:41:25 +02:00
Dmitriy Zaporozhets
d88332709c Fixed group issues/mr. Also speedup project list of admin area 2012-10-04 10:51:35 +03:00
Dmitriy Zaporozhets
c8412bc9ed Dont change params hash. Use dup instead 2012-10-03 15:02:02 +03:00
Dmitriy Zaporozhets
ce1b79afa9 SQL Fixes 2012-10-03 14:26:37 +03:00
Dmitriy Zaporozhets
224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00
randx
1b6a3dfec9 Move all stuff to groups controller 2012-10-02 20:42:15 +03:00
Dmitriy Zaporozhets
f9eda9b33a Group filtering on dashboard 2012-10-02 19:37:53 +03:00
Dmitriy Zaporozhets
d6363e9359 Admin Group scaffold -> new, show, index 2012-10-02 19:01:40 +03:00
Cyril
be18397d82 rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
Cyril
933c5e4146 update new controllers 2012-09-27 13:44:53 +02:00
Cyril
e563e948bb Merge branch 'master' into simplify_controllers2 
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
 2012-09-27 12:25:52 +02:00
Robert Speicher
afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -04:00
Robert Speicher
f8c02f6e39 Add branches and tags Repo methods 
Simplifies the actions in RepositoriesController
 2012-09-26 16:32:26 -04:00
Robert Speicher
e9bd45060e Fix logs not showing in Tree for the root path 2012-09-26 16:32:25 -04:00
Robert Speicher
b6d6663e0e Fix the remaining actions in RefsController 2012-09-26 16:32:25 -04:00
Robert Speicher
6cb626ef51 Add Compare#index and Compare#create actions 
Create just redirects to our specially-formatted #show action
 2012-09-26 16:32:24 -04:00
Robert Speicher
95f0a41141 Fix Refs#switch 2012-09-26 16:32:23 -04:00
Robert Speicher
33126227af Remove check_token_auth filter 
Because of the way ExtractPaths works, `params[:format]` wouldn't
necessarily be available at the time this filter was running, and so it
would erroneously redirect to `new_user_session_path`
 2012-09-26 16:32:23 -04:00
Robert Speicher
1048917232 Update usages of project_commit[s] route helpers 2012-09-26 16:32:23 -04:00
Robert Speicher
99d391332f Add a "patch" MIME type, and render it like a normal view in Commit#show 2012-09-26 16:32:23 -04:00
Robert Speicher
3574826920 Use Commits#show instead of Commits#index 
Takes tree-ish + path as ID
 2012-09-26 16:32:22 -04:00
Robert Speicher
169f16fb32 Remove Commits#compare, add CompareController 2012-09-26 16:32:22 -04:00
Robert Speicher
5a5d214de4 Remove unused render_full_content filter 2012-09-26 16:32:22 -04:00
Robert Speicher
a1e68a9120 Rename RefExtractor to ExtractsPath 
Update docs a bit
 2012-09-26 16:32:22 -04:00
Robert Speicher
a8ea8d98a4 Update RefExtractor to handle atom feeds 2012-09-26 16:32:22 -04:00
Robert Speicher
398ba6f1bb DRY up Blame, Blob and Tree controllers 2012-09-26 16:32:22 -04:00
Robert Speicher
576cec6c67 Add BlobController, remove Refs#blob 2012-09-26 16:32:22 -04:00
Robert Speicher
39c6579306 Add BlameController, remove Refs#blame action 2012-09-26 16:32:22 -04:00
Robert Speicher
79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Robert Speicher
e33cbb9b42 Add TreeController and spec 2012-09-26 16:32:21 -04:00
Robert Speicher
2ddb191706 Require 'github/markup' in Gemfile 2012-09-26 16:32:21 -04:00
Robert Speicher
b389247c02 Use Commit#show instead of Commits#show to view a single commit 
Commits#show (plural) is going to be for showing commit history on a
specific path.
 2012-09-26 16:32:21 -04:00
Robert Speicher
5e1ef575df Add CommitController 2012-09-26 16:32:20 -04:00
Cyril
bdf317addc layout selected by controller name 2012-09-26 22:27:44 +02:00
Cyril
078a8f0e66 factorize before_filters and layout for projects related controllers 2012-09-26 22:27:43 +02:00
randx
0261b0c64c Project activity inifinite scroll paging 2012-09-26 21:01:54 +03:00
Dmitriy Zaporozhets
3c132f2e68 Merge pull request #1561 from dosire/mass_assignment 
Protect users projects_limit from mass assignment.
 2012-09-26 05:45:16 -07:00
Marin Jankovski
5928388b1c Protect users projects_limit from mass assignment. 2012-09-26 13:20:44 +02:00
Cyril
252d3a0c9d remove duplicate before_filter 2012-09-25 22:38:11 +02:00
Dmitriy Zaporozhets
4cc169d3ca Improve commits compare. Added tags to autocomplete. Dont look for commits if from & to are empty 2012-09-21 11:22:53 +03:00
Robert Speicher
b24346fa2b Fix permissions for TeamMembers#index 2012-09-16 10:56:32 -04:00
Robert Speicher
95bd93fe1a Remove Projects#team action 
Uses TeamMembers#index instead, to be more RESTful
 2012-09-16 10:07:06 -04:00
Robert Speicher
8cfb197dfc Remove redundant access check for Issues#destroy 
We were already calling `authorize_admin_issue!` in a before filter with
the same permission checks, so this deleted check wasn't actually doing
anything.
 2012-09-16 10:06:29 -04:00
Robert Speicher
a0893b4d58 Remove non-existent "close" action from authorize_modify_issue filter 2012-09-16 10:06:29 -04:00
Robert Speicher
925183ed7a Add an AdminController base class for Admin controllers 
Handles stuff that's shared across admin controllers.
 2012-09-16 10:06:29 -04:00
Robert Speicher
89069dc5f7 Remove unused ProfileController#password action 2012-09-16 07:38:14 -04:00
Dmitriy Zaporozhets
dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Peter Gonda
795cc9b716 Repaired Get patch 2012-09-14 15:57:25 +02:00
Dmitriy Zaporozhets
fa4150d47d Cleanup after omniauth 2012-09-12 08:23:20 +03:00
Dmitriy Zaporozhets
621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master 
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
 2012-09-12 06:49:52 +03:00
Florian Unglaub
1b0198f1d3 save newly created users directly in the model 2012-08-31 16:24:12 +02:00
Florian Unglaub
6d6c7a17ea Allow single-sign-on with Omniauth 2012-08-31 15:45:50 +02:00
Dmitriy Zaporozhets
2e8b5ebefd Merge pull request #1386 from tsigo/github_markup 
Use GitHub::Markup to parse markup files
 2012-09-09 03:34:50 -07:00
Dmitriy Zaporozhets
7b50a7c99d Merge pull request #1402 from AlexDenisov/preselected_milestone_while_create_new_issue 
Preselected milestone and assignee while create new issue
 2012-09-07 11:10:27 -07:00
Alex Denisov
1b83af6eed IssueController#new refactored 2012-09-07 20:59:12 +03:00
randx
367e17cc84 5xx error status code for gitolite & encoding error 2012-09-07 20:47:52 +03:00
Alex Denisov
f789476241 Merge branch 'master' into preselected_milestone_while_create_new_issue 2012-09-07 17:20:20 +03:00
Alex Denisov
b462b0c6eb Pre-selected assignee implemented 2012-09-07 16:52:48 +03:00
Alex Denisov
26552051b7 Pre-selected milestone implemented 2012-09-07 16:35:59 +03:00
Dmitriy Zaporozhets
61c7449321 Bulk user add on project -> new team member 2012-09-07 09:50:35 +03:00
Dmitriy Zaporozhets
79021e674b Split gitolite backend. Use gitolite_config methods moved to separate class 2012-09-07 08:16:29 +03:00
Nihad Abbasov
c106bb7096 minor refactoring of commits controller 2012-09-06 04:03:46 -07:00
Robert Speicher
b78fd0c130 Add github-markup gem 2012-09-05 16:50:03 -04:00
Robert Speicher
5e1c63d3f0 Move load_refs out of ApplicationController and into CommitsController 
That was the only place it was used.
 2012-09-05 01:13:41 -04:00
Robert Speicher
a9f275bc20 Fix load_refs in ApplicationController after default_branch change 
As a last resort it was calling a method that didn't exist. Woops!
 2012-09-05 01:12:44 -04:00
Robert Speicher
a463353773 Add "empty_repo?" method to Repository role 
Replaces two calls that this method simplifies
 2012-09-04 12:05:21 -04:00
randx
b9ff0c79b4 Changed filters to readable one. Styled some stuff 2012-08-30 22:15:34 +03:00
randx
92137b7beb Removed class 'small' for some buttons. Fixed issue creation 2012-08-30 20:00:16 +03:00
randx
b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
Florian Unglaub
36ffdf36b9 Merge issue fixed 2012-08-24 15:40:44 +02:00
Florian Unglaub
48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
randx
d5fcf0f672 Show labels specific to project 2012-08-24 15:34:27 +03:00
Cyril
2b38f51a17 fix merge request form 2012-08-25 00:22:45 +02:00
randx
3dd7703b80 Feature: Labels page. Index page 2012-08-24 13:05:40 +03:00
Dmitriy Zaporozhets
2e7ca8c866 Show only tm events related to this project 2012-08-21 08:20:11 +03:00
randx
366c0065c4 Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap 
Conflicts:
	app/models/user.rb
 2012-08-21 08:39:23 +03:00
randx
d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
Florian Unglaub
a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Robert Speicher
5a90d044f7 Allow filtering by issues with no assigned... assignee 
Continues #1222
 2012-08-13 20:49:18 -04:00
Robert Speicher
b1ea0b3c01 Allow filtering by issues with no assigned milestone 
Closes #1222
 2012-08-13 01:38:00 -04:00
randx
731b6be9c9 Handle app crash on huge commits 2012-08-11 15:59:36 +03:00
Robert Speicher
7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Dmitriy Zaporozhets
5fd0e7ba11 Merge pull request #1198 from NARKOZ/preview_notes 
ability to preview notes
 2012-08-10 06:42:31 -07:00
Nihad Abbasov
9639780359 render notes preview on server-side 2012-08-09 23:47:48 -07:00
Dmitriy Zaporozhets
839757598b Wiki pages page 2012-08-09 07:34:29 +03:00
Riyad Preukschas
8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
randx
7dd276817c Rack mini profiler for dev env 2012-08-02 09:48:53 +03:00
Riyad Preukschas
eb06dd79f8 Update views for GFM 2012-08-02 02:54:57 +02:00
Jakub Jirutka
fa5a53f5ed Change identification of users with extern auth provider (LDAP) 2012-07-29 16:15:52 +02:00
randx
00b280c3f9 Feature: Bulk Issues update 2012-07-28 03:35:43 +03:00
Dmitriy Zaporozhets
5926bbac12 Backend Refactoring 2012-07-31 08:32:49 +03:00
randx
c27105f8c3 Fixed dashboard loader, fixed 404 for reporter on empty wiki page. 
Styled Wiki edit page
 2012-07-26 14:45:17 +03:00
randx
501ca8e6e8 Fix compare crash after decorator refactoring 2012-07-25 21:45:53 +03:00
randx
0296121f08 Remove recreated mailer controller for admin 2012-07-25 21:38:33 +03:00
randx
61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments 
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
 2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets
5133541f25 Merge pull request #1127 from riyad/use-decorators 
Use CommitDecorator more
 2012-07-25 11:25:55 -07:00
Dmitriy Zaporozhets
92d98f5a0c Merge pull request #1118 from patthoyts/pt/ldap-missing-password 
Handle LDAP missing credentials error with a flash message.
 2012-07-25 01:51:06 -07:00
Riyad Preukschas
34cea1cb63 Update views to use CommitDecorator 2012-07-22 13:08:24 +02:00
Pat Thoyts
a2d244ec06 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>
 2012-07-21 09:04:05 +01:00
randx
a69fc5dd23 Endless event loading for dsahboard 2012-07-21 10:23:05 +03:00
Ian Morgan
04a85f4582 Show wiki comments for all revisions 2012-07-20 13:16:19 -04:00
Dmitriy Zaporozhets
3063af5adc BaseContext 
Controllers refactoring with contexts
Move commit compare logic to model
 2012-07-20 08:39:34 +03:00
Dmitriy Zaporozhets
3c6daec4b1 Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq 2012-07-20 09:08:16 +00:00
Ian Morgan
36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
Dmitriy Zaporozhets
1464952597 Fix comments in MR. Fixed event destroy with user 2012-07-19 07:05:57 +03:00
Valeriy Sizov
86bd11cbd8 System Hooks: rspec 2012-07-19 00:25:10 +03:00
Valeriy Sizov
f5908cef19 System Hook: implemented 2012-07-19 00:25:10 +03:00
Valeriy Sizov
c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Valeriy Sizov
65dc68b35c Refactoring of hook functionality & bootsrap system hooks 2012-07-19 00:25:10 +03:00
Valeriy Sizov
72a571724d Merge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project 
show flash notice after deletion of a project
 2012-07-18 05:35:42 -07:00
Pat Thoyts
f322975c50 Improve handling of misconfigured LDAP accounts. 
Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-16 23:31:28 +01:00
moregeek
990b9217d9 show flash notice after deletion of a project 2012-07-16 14:01:32 +02:00
randx
1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
Dmitriy Zaporozhets
4c24cabf47 Merge pull request #1012 from NARKOZ/devise 
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
 2012-07-06 08:18:18 -07:00
Nihad Abbasov
2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets
d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
randx
264ee0c5a1 Tabs styled. MR Get Patch 2012-07-05 01:26:23 +03:00
randx
1d543e6430 Finished with configs 2012-07-02 21:59:48 +03:00
randx
2def1c7217 Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
Dmitriy Zaporozhets
f73d71810e Merge pull request #1018 from glebm/master 
Resque Authentication + iFrame view
 2012-06-29 04:53:43 -07:00
gleb
2da45e9cbf Refs #1013 
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
 2012-06-29 13:46:24 +02:00
Pierre GUINOISEAU
97d74c2adc Add configurable default for projects_limit 2012-06-29 12:57:33 +02:00
randx
335f9d6410 New Feature: Diff patch file export for commit 2012-06-28 12:51:50 +03:00
randx
5f356d6928 Issues tags: refactoring 2012-06-27 23:13:44 +03:00
Dmitriy Zaporozhets
50fdb2e7df Remove critical status from Issue. Move sort instead 2012-06-27 21:30:35 +03:00
Dmitriy Zaporozhets
1b1e77c728 Issue Labels: Edit, show, index + filter 2012-06-27 21:20:35 +03:00
James Earl Douglas
69ba86e887 fix typo: 'avaialble' -> 'available' 2012-06-26 09:17:23 -07:00
randx
6d92aa6d12 Fix IssueObserver current_user assign. Refactored observers 2012-06-24 10:01:42 +03:00
randx
193804516b Fix project redirect after destroy 2012-06-22 22:48:03 +03:00
randx
1903f6ade0 admin area -> search for users 2012-06-21 19:05:09 +03:00
randx
98a45ce6ee admin area -> search for projecs 2012-06-21 18:54:57 +03:00
randx
4ac0160a11 Hande error with huge commits 2012-06-20 20:08:18 +03:00