summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Disallow new users from Oauth signup if `allow_single_sign_on` is disabledJan-Willem van der Meer2014-10-161-2/+6
| | | | | | | Because devise will trigger a save, allowing unsaved users to login, behaviour had changed. The current implementation returns a pre-build user, which can be saved without errors. Reported in #1677
* Show merge in progress message if MR is lockedDmitriy Zaporozhets2014-10-152-1/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-151-1/+1
|\
| * Merge pull request #8048 from skv-headless/masterDmitriy Zaporozhets2014-10-151-1/+1
| |\ | | | | | | same rendering for note diff as for usual diff
| | * same rendering for note diff as for usual diffEvgeniy Sokovikov2014-10-151-1/+1
| | |
* | | Add links to the migration doc, make it clear import is only for git repos.Marin Jankovski2014-10-152-2/+4
|/ /
* | Merge branch 'fix-star-icon' into 'master'Dmitriy Zaporozhets2014-10-152-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix star icon Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/682. See merge request !1180
| * | Use stars icon on explore->starred pageDmitriy Zaporozhets2014-10-142-1/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'improve-mr-widgets' into 'master'Dmitriy Zaporozhets2014-10-152-11/+12
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve MR widgets Before: ![Screenshot 2014-10-14 17.49.03](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/0283aa379e/Screenshot_2014-10-14_17.49.03.png) After: ![Screenshot 2014-10-14 17.48.58](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/ca9f2bae19/Screenshot_2014-10-14_17.48.58.png) See merge request !1178
| * | Move "modify merge message link" to the right to prevent accidently hiting ↵Dmitriy Zaporozhets2014-10-141-9/+8
| | | | | | | | | | | | | | | | | | accept button Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make accept MR widget looks similar to panelsDmitriy Zaporozhets2014-10-141-2/+4
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'feature-multiple-ldap-servers' into 'master'Dmitriy Zaporozhets2014-10-146-14/+18
|\ \ | |/ |/| | | | | | | | | | | Feature multiple ldap servers Update the code so Gitlab-EE can support multiple LDAP servers See merge request !1172
| * Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-142-4/+4
| |
| * Move dynamic omniauth declarations to initializerJan-Willem van der Meer2014-10-141-4/+0
| |
| * Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-serversJan-Willem van der Meer2014-10-134-11/+42
| |\ | | | | | | | | | | | | Conflicts: app/controllers/omniauth_callbacks_controller.rb
| * | Add refactoring for multiple LDAP server supportJan-Willem van der Meer2014-10-136-33/+36
| | | | | | | | | | | | These changes are ported from EE to CE. Apply changes for app directory
| * | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-132-9/+58
| |\ \ | | | | | | | | | | | | Improve event note display in dashboard and project activity views
* | | | Different wording for notification note.Marin Jankovski2014-10-141-3/+3
| | | |
* | | | Add a note about notification for a project.Marin Jankovski2014-10-141-4/+8
| | | |
* | | | Merge pull request #7942 from cirosantilli/commit-changes-uppercaseDmitriy Zaporozhets2014-10-133-18/+17
|\ \ \ \ | |_|_|/ |/| | | Make new and edit file submit more uniform
| * | | Make new and edit file submit more uniformCiro Santilli2014-10-083-18/+17
| | | |
* | | | Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-134-11/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Sorting users in admin See merge request !1170
| * | | | Admin: user sortingValery Sizov2014-10-134-11/+42
| | | | |
* | | | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-10-131-20/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature oauth refactoring same MR as gitlab/gitlab-ee!188 See merge request !1169
| * | | | | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-101-20/+15
| |/ / / /
* | | | | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-132-9/+58
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | Improve event note display in dashboard and project activity views
| * | | Improve dashboard note view and add testsVinnie Okada2014-10-122-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the `#first_line_in_markdown` method so that the first line of parsed text is displayed more reliably, and the continuation indicators ("...") are displayed in all cases where the note is truncated. Also add Rspec tests for `EventsHelper#event_note`.
| * | | Preserve link href in truncated note viewVinnie Okada2014-10-122-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | Notes on the dashboard views are truncated to 150 characters; this change ensures that when a link's text is truncated it still points to the correct URL.
* | | | Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-1215-15/+37
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ambiguous sha problem with mentioned commit Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception. - [x] write full commit sha in db. - [x] Standardise usage of sha truncation: 8 characters everywhere. - [x] prevent exception when ambiguous sha requested in markdown Fixes #1644 See merge request !1171
| * | | Dontr decoarate already decorated stuffDmitriy Zaporozhets2014-10-101-1/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use 8chars short sha for commit in viewsDmitriy Zaporozhets2014-10-104-4/+10
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Dont raise exception when wrong commit id passedDmitriy Zaporozhets2014-10-101-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use full commit sha width for reference in note body to prevent Ambiguous ↵Dmitriy Zaporozhets2014-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | SHA1 prefix problem Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-1011-11/+19
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #7915 from bbodenmiller/patch-12Sytse Sijbrandij2014-10-121-3/+3
|\ \ \ | |/ / |/| | improve wording on protected branches page
| * | improve wording on protected branches pageBen Bodenmiller2014-10-121-3/+3
| | |
* | | Remove unused methodVinnie Okada2014-10-091-7/+0
| | |
* | | annotateValery Sizov2014-10-0918-129/+175
| | |
* | | Snippets: public/internal/privateValery Sizov2014-10-0911-48/+164
| | |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-081-1/+2
|\ \ \
| * \ \ Merge pull request #7986 from liammonahan/masterDmitriy Zaporozhets2014-10-081-1/+2
| |\ \ \ | | | | | | | | | | Correctly pluralize participants on issue show page
| | * | | Correctly pluralize participants on issue show page.Liam Monahan2014-10-081-1/+2
| | | |/ | | |/|
* | | | Remove border radius because it has wrong backgroundDmitriy Zaporozhets2014-10-081-2/+0
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'improve-danger-zone' into 'master'Dmitriy Zaporozhets2014-10-0810-111/+150
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve danger zone * show transfer/remove boxes by default * ask person to type project name before transfer/remove Fixes #1347 See merge request !1161
| * | | Restyle colorful panel boxesDmitriy Zaporozhets2014-10-086-40/+33
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Apply ConfirmDangerModal for project transfer/remove actionsDmitriy Zaporozhets2014-10-083-7/+22
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | ConfirmDangerModal window added. It will be used for confirmation of ↵Dmitriy Zaporozhets2014-10-082-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | dangerous actions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | show danger settings by defaultDmitriy Zaporozhets2014-10-081-86/+75
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #7545 from buildbox/buildbox-serviceDmitriy Zaporozhets2014-10-083-6/+131
|\ \ \ \ | |/ / / |/| | | Buildbox Service Integration
| * | | Handle the case where the CI service may not provide a status_img_path method.Keith Pitt2014-10-081-2/+7
| | | |
View Lorry Controller Status